Layering fixes and element renames of settings form
On-going work on multi-currency support