Image buttons + bug fix