Added GUIManager and Buttons
fixed conflicts