Several buttons fixed