Adjust markup to use aside/main