Updated HTML ids