Tweaked the Widget class and started making it extendable