More changes to bootstrap and customization