Improved web client + minor updates in server