Small GUI fixes
Added gui classes