Minor improvement
JAAS backout, fixes and webpage style changes