Major restructuring of the client code: shared UI components placed under CommonApp