Fixed Settings Page to be consistent and fixed some bugs