Structure / layout / wireframe refactored and done