Renamed classes and added css and layout changes