settings view + various cleanup/fixes in other steps