Basic menu added + refactor