re-design layout