More organization in layout, added bower bootstrap