redesign of the faf modular client