html simplifications and cleanup