Fully modified layout for the lobby section, some minor bug fixes as well