font-awesome corrections and some corrections for form-switch