fixed hash bug and btn layout