Move some markup around
Add the dynamic title feature