Add settings button and early 1.7 work