Restrucutred all boxes