Partial commit with work done to date on settings form
Fixing settings form