Fixed bug 132, refactored settings pages (not all)