Refactoring continues - main controller shortened by 116 lines: avatar shop, misc bugs