redesigned the layout