Some HTML and EDMX updates