Refactor controls (load per ajax)