Fine tweaks / remove lost hr tags