Final version with menu added