re-structure layout