Preference buttons freeze now, also removed some useless code
Merge branch 'master' of https://github.com/pmsc73/cs3716.git