fixed some button layouts