#187 rework top item. partial
issue #187 rework top item. partial