Move some HTML display together for readability