cleaning up the UI to match current story better