adding fontawesome and cleaning up templates