Add lobby screen
merge