updated app layout and views