Form improvements + Added Font-Awesome