Bitmap, Graphics class and few update functions refactored