switch to font awesome for icons, plus some cleanup
move some things around, no major changes