Update layouts to better utilize bootstrap