Clean up and added button img