Fix lots of stuff; change the layout; add fontawesome icons