Add font-awesome and some little changes