-mostly cleanup and consolidating some widgets