new branch, client now communicates with server
fix activity to make it look neat