Fixed syntax in the server and aesthetics in the front-end