restructure
improved layout