added widgets, rebuilt it all how it works so prototype will be easier