Fixed views to reflect new server return data

Fixes #51