Restructure and responsive