Building image changed and controller improved. We should refactor somethings...