Further development of client app
Further development of client app