adding fontawesome and cleaning up rules