GUI improvements and minor bug fixes