settings update 3

committing missing changes related to settings menu from 04/11 and
commented out alert dialog code temporarily