Updated application view
Merge app layout