Cleaning up some buttons and using some formatted prices