Modified category window (MERGED)