some fixes, buttons draw with labels