Logo + improved state and input management