Code cleanup, new progress bar and OSD control positions