ARG-18: Top menu once again