Updated layout and added Bootstrap