API views render json and html
Move things around and improve API HTML experience