Added boostrap, and tidy up the display