Added select button for clients and fixed a couple of bugs