Modulalize launcher into an activity
Clean up some lobby stuff