Removed old toggle widget and fixed the size issue