unified Button, made little clean up