Fixed generated buttons layout