cosmetics
merged application.html.erb