Fix HTML and better bootstrap appearance