UI code finalized