Some work on making this work nicely with bootstrap