Version 1.0b - html fixes