Switched to use partial view