Switch to bootstrap and improve display