lots of tweaks to design and added new widgets