Improve semantic HMTL order, fix follow-up z-index hover bug