filtered UI changes on how buttons work and show proper data