Clean-up & added font-awesome support