Fix small ui inconsistencies