UI consistency, fixes