Fixed some gui problems