cleanup, minor fixes and new html table for Ha500 selection