Work on bootstrap table issues