Reformatted Controller/Action for easier customization

A little easier to customize
Humanized titles
Tested locally