Added some admin preferences and tidied up indent consistency
Merge branch 'development'