General clean up, bootstrap add and nav menu