Minimal fixes to UI
prevent duplicate urls