Task #3901 & #3902 Improve create and update device view
Merge pull request #18 from VanGiang/task/3901

Task #3901 & #3902 Improve create and update device view