Server: styles in html changed
Client: code simplification