fixed errors, menu