Fixes for HTL. Some nicer styling.