Marge code in single controller, handle some issues,complete the review changes