Fixed the layout and did the bar mock