Move class name and tweak design