ui tweaks and inconsistency fixes