improved button layouts