Updated layout and added bootstrap