Doing some HTML / sort tweaks