Redesign #3

Closed
arek wants to merge 15 commits from redesign into master
No description provided.