Item buttons simplification (draft)