Moved markup around