updated layouts
updated app layout