Refactor initial draw so that dimensions are available the first time, and also removed unnecessary redraw.