Shorten button value, cleanup