UI rules and users improvements