Settings view, button fixes, consistency