More UI demystification
Merge pull request #2300 from HabitRPG/sabe/tweak

More UI demystification