Restructure widgets