re-organize layout