more clean up and adding bootstrap