Fixed some issues with content widget