Fixed minor bugs with GUI