Improvement: Avoiding to redraw the whole screen
Merge remote-tracking branch 'origin/refactoring'