Menu Icon and minor fixes