fix button and minor fix