refactored with partial view
added partial view