Messy content and style editing, need to move logic to commands