Some work on the settings page
merging master into huybranch