removed button and shorten stuff

@davehoec review plz.