Made minor style changes to setting, revamped clickabilty in settings
code cleanup