fixes for settings and merging styling branch