Final GUI changes to preferences page
Merge branch 'master' of https://github.com/cvocvo/CS486