rename and add better boxes