Additional work && added bootstrap for layout