Partialed out the application layout
Resolved conflict in application layout