Rationalisation of the system of frontend handles. Most modular bits