improving on buttons