UI Updates and 3d merge completion