Updated bootstrap and router, made it less sloppy!