Merge branch 'alinasava/web-dev-a' into 'master' fix main nav z-index See merge request makerlog/web!25