More bug fixes; adding Bootstrap demo page