Added menu, removed tabs