- Implemented GUI fixes