Revert commits fb3843f..HEAD (Ones done after applying a merge of PR #237)

This reverts commits:
a02f64826a04cffae4dc1693d54d8eb496ceab6d
08ce9eb046eb5d1cc2002d0943c854a592341033
01235ab4ce232073bb9c5fa2c34fc2228190c2ae
4ee03ed14f854d59c576ad32b3d2c0bb4f2533e5
89d3270a8adf350531bd63bcce503b3f9eed10c8
Revert "Merge pull request #237 from Animatron/new-design"

This reverts commit fb3843fb73d9f9d3a323fc36372eb3d223cda587, reversing
changes made to 49cc953ee2877952854f6594293d84326215f1e5.