Fixed - Correct logic from header module to right controller (layout, header's item)