Added Cutomer Controller and fixed keys