Some html rearranging