Tweaks

Some more tweaks, mostly on GUI