Updates to backend and include for ui improvements