Change Layout

improved layout