several gui changes and restructuring