Fixed problem with spaces in HTML IDs, other small changes

Change-Id: I4b21661184fa629e20b7c0db034f12da426136c4