Add Settings screen
merge