Removed old text, shuffled/fixed markup