changed main panel to display picture when in lobby.
fixed merge conflicts.