System page navigation improvements, not finished
Merge branch 'develop' into ux
Merge branch 'develop' into ux
Updating the Settings pages
Merge branch 'develop' into ux
Updated the settings pages UX
Merge branch 'ux' into develop