initial styling, included font-awesome
fix merge conflict