Code fixes for fancy buttons