Improve states checking
Hook list buttons