Cleaned up some places, fixed som bugs, added some fontawesome icons, tweaked som small stuff