Updated design and fixed scrolling issue