Scroll bar moved outside && updated paddings