Moved control panel

And some updated variable names
New PopupManager for displaying messages

Not fully integrated yet
Changed some formatting?