Updates to app logic, template and CSS