revert some bad decisions
changed the layout