Small fixes, but big UI update