Fix button issues and add new button images