Updated to API and Frontend page