Slightly improved button layout