refactoring, drawing right screen added