Huge Update

Various front end changes, new merchant custom front end directory.