Commit current work before refactoring screen
Commit current work before refactoring screen