Further work over API and web pages