Draw mode implemented, UI Changes, Bug Fixes