Persist clicked state, clicking works better now