general ui improvements
fix re-test button
tweak