Added Font Awesome and X to remove subscriptions
Merge branch 'colin'