Updated app layout, etc