Fixed views to reflect new server return data