Integrated UI

Few changes to the integrated UI