Wireframe restructuring and Layout reformatting