fixed some UI inconsistences