Menu fixing. + DB Fix