Updated for new settings menu