restructure layout and partial styling