Fixed gui problems