PIM-1530: Clean code in metric filter and form type
PIM-1530: Refactor layout
PIM-1530: Remove useless code