Tidy
Settings updates
View updates