restructure layout