Update API and Charts page

Fix #5
Fix #6