Updated layout, added bootstrap