Fixed layout bugs from previous merge. Working on show product page.