Revert "Significant changes in layout and CSS"

This reverts commit 207686290a0dbe069b40130e02253e6b5336d345.