Render menu only when needed, add right menu