Minor fixes. Removed widgets where there was no data.