Bugfix basic widgets, added yr-adapter