Adding some methods to the Classes.
Fixing issue where the title displayed did not match the action being performed
Merge branch 'master' into m_develop