[archimedes]: Minor server-side fix
[archimedes]: Refactoring
[archimedes]: Minor CSS changes