fix and clean up of bootstrap table