Merge pull request #1169 from ahomatthew/develop

Fix for textwidget not rendering properly
Added number pagination for shannon