consolidated views, added blade logic to check for passed variables