Several updates, added font-awesome