Fixing widget layout and fuctionality issues