Updated layout, removed old layout and styles