various ui tweaks, mainly to get rid of visible template markup on slow browsers