Made "Vibration" setting work

TODO: Stop "test" dismissing the dialog
Cleaned up code