Bootstrap styling and other fixes