UI tweaks, re-enabled resolve_references