Minor html and layout enhancements