Settings page fixes #14