Fixed profile settings controller so that trees are not duplicated
Removed duplication of code
Tests surrounding Profile Settings Page