Cleanup HTML + fix boolean result not being displayed