Implemented new widget structure and rearranged resources.