Fixed layout and application.html.erb issues