Reverted major changes to oscaarGUI