RTI Generation and UI fixes