Update some stuff to better fit bootstrap