Bug fix on buttons