Complete client app

Finished up some details of the client app