Moved more components from GUI to PsychComponent