Bug Fixes, Button redesign, wizard class