PIM-1794: Clean UI