remove empty folders
correctly add widgets