Rest of FXForm
Formating Tweaks
Updates