Improved content around timeouts

some other tweaks to the markup