small bug fixes
Adding first version of widget