Added UI, more tweaks