Visual improvements and bug fixes to one of the helpers