Added settings page and minor tweaks