Small changes to UI and source structure