Lots of changes
Move icons
Merge pull request #109 from findsorguk/viewHelperProblems

View helper problems