Fixed menu
Get fields from partials proper
Removed debugging