Improved button fitting.