gui changes and minor bug fixes