Simplifying menu C code and adding separators to API.