Cleaned up UI for Options View.
resolving a tiny conflict
Merge remote-tracking branch 'origin/master'