improve that html a bit