UI complete.

Updated the UI with reference fixing logic