Revamped product guide

Additional changes and clean up