Revert "Changes related to UI and design. Merging code."

This reverts commit 89dd0eef52ab89c424b77c2debb2d865175d402f.