Refactored some code, updated lobby view
Here it's coming: #32