add calc and fix bootstrap