Image clean up and button improvements