Improved button a bit