merged my previous changes in feature/settings-menu