more gui stuff
fucking merge conflicts