Further integration of the UI