Misc fixes/gui cleanup