Adding menu + some core changes