refactored applicaiton layout with partials
fixed conflict