Updated app layout and views