Settings cleanup & better v-rhythm