Refactor controller
Cap nhat assignments
Update settings lop