Added bootstrap and other tweaks