Updated and finished client view