Fixed Attribution UI and functional issues