Further style updates. Added Widget modification to the requirements.