Cleanup and improve Web interface