fixed button logic and added images