fixed variable names
Removed unneeded Catalog override
Fixed Cart label in AppBar (Issue #2)