UI tweaks and using my fork of the_role