Added alert dialog and tweaked the settings screen