Merge pull request #1 from Berco/master

Cleaning up
Merge pull request #2 from Berco/master

Again a cleanup :)
Merge pull request #3 from Berco/master

TYS and TAT back to service
Removed All Unused Imports

Have removed all unused .R imports
Renamed the ids of aptitude class

renames the ids of aptitude as well as main menu...will do more with
time.