Integrated some of the UI