Updates to the api + app layout