Added overrides and updated HTML