Worked on GUI for Lobby
Merge fix
Fixed conflict