clean up layout; improve navigation