fixed application layout from merge error and stylesheets