integrating with various of the UI pages, TODO dynamically display some content depending on state
trying to fix merge conflict