Label improvements in option page