updated gui and removed some ifdefs