Improved button rendering