Cleanup & GUI fixes