More work on app layout...