Committing single term product layout of frontend
Merged changes update to PM-23