Reconfigure using backbone
Code clean-up