#96 Updated settings pages