restructure layout and modify design