Additional work to move settings off of tab bar