GUI fixes
A lot of fixes