Changed some gui features and fixed some minor bugs