Some Fixes, GUI changes