Menu added; minor fixes