Seperated API and HTML and added in singel view
Updated test to work with new split