Convert to bootstrap.
Further updates to bootstrap