Changed left menu to list items
conflicts resolved