Continue horizontal menu rework