changes to reDraw method and modify button added