Forgot to commit hammer lib + fix some problems with buttons