Small improvements on buttons