Rearrange somewhat
Do some work towards manual in iframes