diff --git a/marketplace/code/ui/admin/MarketPlaceAdminPage.php b/marketplace/code/ui/admin/MarketPlaceAdminPage.php
index 918a860..87bbccc 100644
--- a/marketplace/code/ui/admin/MarketPlaceAdminPage.php
+++ b/marketplace/code/ui/admin/MarketPlaceAdminPage.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2014 Openstack Foundation
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,23 +16,25 @@
  * Class MarketPlaceAdminPage
  * Defines MarketPlace Admin area
  */
-class MarketPlaceAdminPage extends Page implements PermissionProvider {
-	static $db = array(
-	);
+class MarketPlaceAdminPage extends Page implements PermissionProvider
+{
+	static $db = array();
 
-	static $has_one = array(
-	);
+	static $has_one = array();
 
-	function providePermissions() {
+	function providePermissions()
+	{
 		return array(
 			"MARKETPLACE_ADMIN_ACCESS" => "Access the MarketPlace Admin"
 		);
 	}
 }
+
 /**
  * Class MarketPlaceAdminPage_Controller
  */
-class MarketPlaceAdminPage_Controller extends Page_Controller {
+class MarketPlaceAdminPage_Controller extends Page_Controller
+{
 	/**
 	 * @var IMarketplaceTypeRepository
 	 */
@@ -104,20 +107,21 @@ class MarketPlaceAdminPage_Controller extends Page_Controller {
 	 */
 	private $consultant_repository;
 
-	function init() {
+	function init()
+	{
 		parent::init();
 		//check permissions
-		if(!Member::currentUser() ||  !Member::currentUser()->isMarketPlaceAdmin())
+		if (!Member::currentUser() || !Member::currentUser()->isMarketPlaceAdmin())
 			return Security::permissionFailure();
 		//css
 		Requirements::css("marketplace/code/ui/admin/css/marketplace.admin.css");
 		Requirements::css("themes/openstack/css/chosen.css", "screen,projection");
 		Requirements::css("marketplace/code/ui/admin/css/colorpicker.css", "screen,projection");
-		Requirements::css(Director::protocol()."code.jquery.com/ui/1.10.4/themes/smoothness/jquery-ui.css");
+		Requirements::css(Director::protocol() . "code.jquery.com/ui/1.10.4/themes/smoothness/jquery-ui.css");
 		//js
-		Requirements::javascript(Director::protocol()."ajax.aspnetcdn.com/ajax/jquery.validate/1.11.1/jquery.validate.min.js");
-		Requirements::javascript(Director::protocol()."ajax.aspnetcdn.com/ajax/jquery.validate/1.11.1/additional-methods.min.js");
-		Requirements::javascript(Director::protocol()."code.jquery.com/ui/1.10.4/jquery-ui.min.js");
+		Requirements::javascript(Director::protocol() . "ajax.aspnetcdn.com/ajax/jquery.validate/1.11.1/jquery.validate.min.js");
+		Requirements::javascript(Director::protocol() . "ajax.aspnetcdn.com/ajax/jquery.validate/1.11.1/additional-methods.min.js");
+		Requirements::javascript(Director::protocol() . "code.jquery.com/ui/1.10.4/jquery-ui.min.js");
 		Requirements::javascript("themes/openstack/javascript/jquery.jsonp-2.4.0.min.js");
 		Requirements::javascript("themes/openstack/javascript/jquery.validate.custom.methods.js");
 		Requirements::javascript("themes/openstack/javascript/pure.min.js");
@@ -133,27 +137,28 @@ class MarketPlaceAdminPage_Controller extends Page_Controller {
 		Requirements::javascript('marketplace/code/ui/admin/js/private_clouds.js');
 		Requirements::javascript('marketplace/code/ui/admin/js/consultants.js');
 		// model
-		$this->marketplace_repository                      = new SapphireMarketPlaceTypeRepository;
-		$this->companies_with_marketplace_creation_rights  = new CompaniesWithMarketplaceCreationRightsSapphireQueryHandler;
-		$this->distribution_repository                     = new SapphireDistributionRepository;
-		$this->appliance_repository                        = new SapphireApplianceRepository;
-		$this->components_repository                       = new SapphireOpenStackComponentRepository;
-		$this->hyper_visors_repository                     = new SapphireHyperVisorTypeRepository;
-		$this->guests_os_repository                        = new SapphireGuestOSTypeRepository();
-		$this->video_type_repository                       = new SapphireMarketPlaceVideoTypeRepository;
-		$this->support_channel_types_repository            = new SapphireSupportChannelTypeRepository;
-		$this->region_repository                           = new SapphireRegionRepository;
-		$this->pricing_schema_repository                   = new SapphirePricingSchemaRepository;
-		$this->public_clouds_repository                    = new SapphirePublicCloudRepository;
-		$this->private_clouds_repository                   = new SapphirePrivateCloudRepository;
-		$this->config_management_type_repository           = new SapphireConfigurationManagementTypeRepository;
-		$this->consultant_service_offered_type_repository  = new SapphireConsultantServiceOfferedTypeRepository;
-		$this->consultant_repository                       = new SapphireConsultantRepository;
+		$this->marketplace_repository = new SapphireMarketPlaceTypeRepository;
+		$this->companies_with_marketplace_creation_rights = new CompaniesWithMarketplaceCreationRightsSapphireQueryHandler;
+		$this->distribution_repository = new SapphireDistributionRepository;
+		$this->appliance_repository = new SapphireApplianceRepository;
+		$this->components_repository = new SapphireOpenStackComponentRepository;
+		$this->hyper_visors_repository = new SapphireHyperVisorTypeRepository;
+		$this->guests_os_repository = new SapphireGuestOSTypeRepository();
+		$this->video_type_repository = new SapphireMarketPlaceVideoTypeRepository;
+		$this->support_channel_types_repository = new SapphireSupportChannelTypeRepository;
+		$this->region_repository = new SapphireRegionRepository;
+		$this->pricing_schema_repository = new SapphirePricingSchemaRepository;
+		$this->public_clouds_repository = new SapphirePublicCloudRepository;
+		$this->private_clouds_repository = new SapphirePrivateCloudRepository;
+		$this->config_management_type_repository = new SapphireConfigurationManagementTypeRepository;
+		$this->consultant_service_offered_type_repository = new SapphireConsultantServiceOfferedTypeRepository;
+		$this->consultant_repository = new SapphireConsultantRepository;
 	}
 
 
-	public function index() {
-		if($this->canAdmin('implementations'))
+	public function index()
+	{
+		if ($this->canAdmin('implementations'))
 			return $this->getViewer('index')->process($this);
 		else if($this->canAdmin('public_clouds'))
 		{
@@ -166,8 +171,9 @@ class MarketPlaceAdminPage_Controller extends Page_Controller {
 		else if($this->canAdmin('consultants'))
 		{
 			return Controller::curr()->redirect($this->Link("consultants"));
+
 		}
-		return $this->httpError(401,'Unauthorized: you do not have the proper rights to access this page.');
+		return $this->httpError(401, 'Unauthorized: you do not have the proper rights to access this page.');
 	}
 
 	static $allowed_actions = array(
@@ -180,43 +186,56 @@ class MarketPlaceAdminPage_Controller extends Page_Controller {
 		'private_cloud',
 		'consultants',
 		'consultant',
+		'preview',
+		'pdf,'
 	);
 
-	public function getCurrentTab(){
+
+	/**
+	 * @var array
+	 */
+	static $url_handlers = array(
+		'GET $MARKETPLACETYPE/$ID/preview' => 'preview',
+		'GET $MARKETPLACETYPE/$ID/pdf'     => 'pdf',
+	);
+
+	public function getCurrentTab()
+	{
 		$current_tab = Session::get('marketplaceadmin.current.tab');
-		if(empty($current_tab)){
+		if (empty($current_tab)) {
 			$current_tab = 1;
 		}
 		return $current_tab;
 	}
 
-	public function setCurrentTab($tab){
-		Session::set('marketplaceadmin.current.tab',$tab);
+	public function setCurrentTab($tab)
+	{
+		Session::set('marketplaceadmin.current.tab', $tab);
 	}
 
 	/**
 	 * @return ArrayList
 	 */
-	public function getCompanies(){
+	public function getCompanies()
+	{
 		$current_marketplace_type = '';
 		$type_id = intval($this->request->getVar('type_id'));
-		if($type_id > 0){
+		if ($type_id > 0) {
 			//choose by current marketplace type ( we are adding a new instance)
-			$type_id  = intval($this->request->getVar('type_id'));
-			if($type_id > 0){
+			$type_id = intval($this->request->getVar('type_id'));
+			if ($type_id > 0) {
 				$product_type = $this->marketplace_repository->getById($type_id);
-				if($product_type){
+				if ($product_type) {
 					$current_marketplace_type = $product_type->getName();
 				}
 			}
-		}
-		else {
+		} else {
 			//choose by current tab (listing)
-			switch($this->getCurrentTab()){
-				case 1:{
+			switch ($this->getCurrentTab()) {
+				case 1: {
 					$current_marketplace_type = IOpenStackImplementation::AbstractMarketPlaceType;
 				}
-				break;
+					break;
 				case 2:
 					$current_marketplace_type = IPublicCloudService::MarketPlaceType;
 					break;
@@ -238,7 +257,7 @@ class MarketPlaceAdminPage_Controller extends Page_Controller {
 
 	public function getDistributionMarketPlaceTypes(){
 		$ds = new ArrayList();
-		$ds->push($this->marketplace_repository->getByType(IDistribution::MarketPlaceType));
+	$ds->push($this->marketplace_repository->getByType(IDistribution::MarketPlaceType));
 		$ds->push($this->marketplace_repository->getByType(IAppliance::MarketPlaceType));
 		return $ds;
 	}
@@ -247,69 +266,76 @@ class MarketPlaceAdminPage_Controller extends Page_Controller {
 		$ds = new ArrayList();
 		if($this->canAdmin('distributions'))
 			$ds->push($this->marketplace_repository->getByType(IDistribution::MarketPlaceType));
-		if($this->canAdmin('appliances'))
+		if ($this->canAdmin('appliances'))
 			$ds->push($this->marketplace_repository->getByType(IAppliance::MarketPlaceType));
-		if($this->canAdmin('public_clouds'))
+		if ($this->canAdmin('public_clouds'))
 			$ds->push($this->marketplace_repository->getByType(IPublicCloudService::MarketPlaceType));
-		if($this->canAdmin('private_clouds'))
+		if ($this->canAdmin('private_clouds'))
 			$ds->push($this->marketplace_repository->getByType(IPrivateCloudService::MarketPlaceType));
-		if($this->canAdmin('consultants'))
+		if ($this->canAdmin('consultants'))
 			$ds->push($this->marketplace_repository->getByType(IConsultant::MarketPlaceType));
 		return $ds;
 	}
 
-	public function getCurrentDistribution(){
-		$distribution_id    = intval($this->request->getVar('id'));
-		if($distribution_id > 0){
-			 return $this->distribution_repository->getById($distribution_id);
+	public function getCurrentDistribution()
+	{
+		$distribution_id = intval($this->request->getVar('id'));
+		if ($distribution_id > 0) {
+			return $this->distribution_repository->getById($distribution_id);
 		}
 		return false;
 	}
 
-	public function getCurrentAppliance(){
-		$appliance_id    = intval($this->request->getVar('id'));
-		if($appliance_id > 0){
+	public function getCurrentAppliance()
+	{
+		$appliance_id = intval($this->request->getVar('id'));
+		if ($appliance_id > 0) {
 			return $this->appliance_repository->getById($appliance_id);
 		}
 		return false;
 	}
 
-	public function getOpenStackAvailableComponents(){
+	public function getOpenStackAvailableComponents()
+	{
 		$query = new QueryObject;
 		$query->addOrder(QueryOrder::asc('Name'));
 		list($list,$size) = $this->components_repository->getAll($query);
 		return new ArrayList($list);
 	}
 
-	public function getCurrentDistributionJson(){
+	public function getCurrentDistributionJson()
+	{
 		$distribution = $this->getCurrentDistribution();
-		if($distribution){
+		if ($distribution) {
 			return json_encode(OpenStackImplementationAssembler::convertOpenStackImplementationToArray($distribution));
 		}
 	}
 
-	public function getCurrentApplianceJson(){
+	public function getCurrentApplianceJson()
+	{
 		$appliance = $this->getCurrentAppliance();
-		if($appliance){
+		if ($appliance) {
 			return json_encode(OpenStackImplementationAssembler::convertOpenStackImplementationToArray($appliance));
 		}
 	}
 
-	public function ReleasesByComponent(){
+	public function ReleasesByComponent()
+	{
 		$res = array();
 		$query = new QueryObject;
-		list($list,$size) = $this->components_repository->getAll($query);
-		foreach($list as $component){
+		list($list, $size) = $this->components_repository->getAll($query);
+		foreach ($list as $component) {
 			$res2 = array();
 			$releases = $component->getSupportedReleases();
-			foreach($releases as $release){
-				array_push($res2, array( "id" => $release->getIdentifier(),"name" => $release->getName()));
+			foreach ($releases as $release) {
+				array_push($res2, array("id" => $release->getIdentifier(), "name" => $release->getName()));
 			}
 			$res[$component->getCodeName()] = $res2;
 		}
 		return json_encode($res);
 	}
 
+
 	public function getHyperVisors(){
 		list($list,$size) = $this->hyper_visors_repository->getAll(new QueryObject);
 		return new ArrayList($list);
@@ -335,37 +361,33 @@ class MarketPlaceAdminPage_Controller extends Page_Controller {
 		return new ArrayList($list);
 	}
 
-	public function add() {
-		$type_id  = intval($this->request->getVar('type_id'));
-		if($type_id > 0){
+	public function add()
+	{
+		$type_id = intval($this->request->getVar('type_id'));
+		if ($type_id > 0) {
 			$product_type = $this->marketplace_repository->getById($type_id);
-			if($product_type){
-				switch($product_type->getName()){
-					case IAppliance::MarketPlaceType:
-					{
+			if ($product_type) {
+				switch ($product_type->getName()) {
+					case IAppliance::MarketPlaceType: {
 						return $this->appliance();
 					}
-					break;
-					case IDistribution::MarketPlaceType:
-					{
+						break;
+					case IDistribution::MarketPlaceType: {
 						return $this->distribution();
 					}
-					break;
-					case IPublicCloudService::MarketPlaceType:
-					{
+						break;
+					case IPublicCloudService::MarketPlaceType: {
 						return $this->public_cloud();
 					}
-					break;
-					case IPrivateCloudService::MarketPlaceType:
-					{
+						break;
+					case IPrivateCloudService::MarketPlaceType: {
 						return $this->private_cloud();
 					}
-					break;
-					case IConsultant::MarketPlaceType:
-					{
+						break;
+					case IConsultant::MarketPlaceType: {
 						return $this->consultant();
 					}
-					break;
+						break;
 				}
 			}
 			Controller::curr()->redirect($this->Link());
@@ -373,7 +395,8 @@ class MarketPlaceAdminPage_Controller extends Page_Controller {
 		Controller::curr()->redirect($this->Link());
 	}
 
-	public function distribution(){
+	public function distribution()
+	{
 		Requirements::javascript('marketplace/code/ui/admin/js/utils.js');
 		Requirements::javascript('marketplace/code/ui/admin/js/jquery.text.area.counter.js');
 		Requirements::javascript('marketplace/code/ui/admin/js/hypervisors.js');
@@ -387,7 +410,8 @@ class MarketPlaceAdminPage_Controller extends Page_Controller {
 		return $this->getViewer('distribution')->process($this);
 	}
 
-	public function appliance(){
+	public function appliance()
+	{
 		Requirements::javascript('marketplace/code/ui/admin/js/utils.js');
 		Requirements::javascript('marketplace/code/ui/admin/js/jquery.text.area.counter.js');
 		Requirements::javascript('marketplace/code/ui/admin/js/hypervisors.js');
@@ -401,7 +425,8 @@ class MarketPlaceAdminPage_Controller extends Page_Controller {
 		return $this->getViewer('appliance')->process($this);
 	}
 
-	public function public_cloud(){
+	public function public_cloud()
+	{
 		Requirements::javascript('marketplace/code/ui/admin/js/utils.js');
 		Requirements::javascript('marketplace/code/ui/admin/js/jquery.text.area.counter.js');
 		Requirements::javascript('marketplace/code/ui/admin/js/hypervisors.js');
@@ -413,13 +438,14 @@ class MarketPlaceAdminPage_Controller extends Page_Controller {
 		Requirements::javascript('marketplace/code/ui/admin/js/pricing.schemas.js');
 		Requirements::javascript('marketplace/code/ui/admin/js/datacenter.locations.js');
 		Requirements::javascript('marketplace/code/ui/admin/js/marketplace.type.header.js');
-		Requirements::javascript(Director::protocol()."maps.googleapis.com/maps/api/js?sensor=false");
+		Requirements::javascript(Director::protocol() . "maps.googleapis.com/maps/api/js?sensor=false");
 		Requirements::javascript('marketplace/code/ui/admin/js/geocoding.jquery.js');
 		Requirements::javascript('marketplace/code/ui/admin/js/public_cloud.js');
 		return $this->getViewer('public_cloud')->process($this);
 	}
 
-	public function private_cloud(){
+	public function private_cloud()
+	{
 		Requirements::javascript('marketplace/code/ui/admin/js/utils.js');
 		Requirements::javascript('marketplace/code/ui/admin/js/jquery.text.area.counter.js');
 		Requirements::javascript('marketplace/code/ui/admin/js/hypervisors.js');
@@ -431,13 +457,14 @@ class MarketPlaceAdminPage_Controller extends Page_Controller {
 		Requirements::javascript('marketplace/code/ui/admin/js/pricing.schemas.js');
 		Requirements::javascript('marketplace/code/ui/admin/js/datacenter.locations.js');
 		Requirements::javascript('marketplace/code/ui/admin/js/marketplace.type.header.js');
-		Requirements::javascript(Director::protocol()."maps.googleapis.com/maps/api/js?sensor=false");
+		Requirements::javascript(Director::protocol() . "maps.googleapis.com/maps/api/js?sensor=false");
 		Requirements::javascript('marketplace/code/ui/admin/js/geocoding.jquery.js');
 		Requirements::javascript('marketplace/code/ui/admin/js/private_cloud.js');
 		return $this->getViewer('private_cloud')->process($this);
 	}
 
-	public function consultant(){
+	public function consultant()
+	{
 		Requirements::javascript('marketplace/code/ui/admin/js/utils.js');
 		Requirements::javascript('marketplace/code/ui/admin/js/jquery.text.area.counter.js');
 		Requirements::javascript('marketplace/code/ui/admin/js/videos.js');
@@ -450,81 +477,84 @@ class MarketPlaceAdminPage_Controller extends Page_Controller {
 		Requirements::javascript('marketplace/code/ui/admin/js/spoken.languages.js');
 		Requirements::javascript('marketplace/code/ui/admin/js/offices.js');
 		Requirements::javascript('marketplace/code/ui/admin/js/marketplace.type.header.js');
-		Requirements::javascript(Director::protocol()."maps.googleapis.com/maps/api/js?sensor=false");
+		Requirements::javascript(Director::protocol() . "maps.googleapis.com/maps/api/js?sensor=false");
 		Requirements::javascript('marketplace/code/ui/admin/js/geocoding.jquery.js');
 		Requirements::javascript('marketplace/code/ui/admin/js/consultant.js');
 		return $this->getViewer('consultant')->process($this);
 	}
 
-	public function getConfigurationManagementTypes(){
+	public function getConfigurationManagementTypes()
+	{
 		$query = new QueryObject(new ConfigurationManagementType);
 		$query->addOrder(QueryOrder::asc('Type'));
 		list($list,$size) = $this->config_management_type_repository->getAll($query,0,1000);
 		return new ArrayList($list);
 	}
 
-	public function getServicesOffered(){
+	public function getServicesOffered()
+	{
 		$query = new QueryObject(new ConsultantServiceOfferedType);
 		$query->addOrder(QueryOrder::asc('Type'));
 		list($list,$size) = $this->consultant_service_offered_type_repository->getAll($query,0,1000);
 		return new ArrayList($list);
 	}
 
-	public function getConsultants(){
+	public function getConsultants()
+	{
 		$product_name = trim(Convert::raw2sql($this->request->getVar('name')));
-		$company_id   = intval($this->request->getVar('company_id'));
-		$sort         = $this->request->getVar('sort');
-		$query        = new QueryObject(new CompanyService);
+		$company_id = intval($this->request->getVar('company_id'));
+		$sort = $this->request->getVar('sort');
+		$query = new QueryObject(new CompanyService);
 		$query->addAlias(QueryAlias::create('Company'));
-		if(!empty($product_name)){
-			$query->addOrCondition(QueryCriteria::like('CompanyService.Name',$product_name));
-			$query->addOrCondition(QueryCriteria::like('Company.Name',$product_name));
+		if (!empty($product_name)) {
+			$query->addOrCondition(QueryCriteria::like('CompanyService.Name', $product_name));
+			$query->addOrCondition(QueryCriteria::like('Company.Name', $product_name));
 		}
-		if($company_id > 0){
-			$query->addAddCondition(QueryCriteria::equal('Company.ID',$company_id));
+		if ($company_id > 0) {
+			$query->addAddCondition(QueryCriteria::equal('Company.ID', $company_id));
 		}
 
 		//set sorting
-		if(!empty($sort)){
+		if (!empty($sort)) {
 			$dir = $this->getSortDir('consultants');
-			switch($sort){
-				case 'company':{
-					if($dir=='asc')
+			switch ($sort) {
+				case 'company': {
+					if ($dir == 'asc')
 						$query->addOrder(QueryOrder::asc('Company.Name'));
 					else
 						$query->addOrder(QueryOrder::desc('Company.Name'));
 				}
-				break;
-				case 'name':{
-					if($dir=='asc')
+					break;
+				case 'name': {
+					if ($dir == 'asc')
 						$query->addOrder(QueryOrder::asc('Name'));
 					else
 						$query->addOrder(QueryOrder::desc('Name'));
 				}
-				case 'status':{
-					if($dir=='asc')
+				case 'status': {
+					if ($dir == 'asc')
 						$query->addOrder(QueryOrder::asc('Active'));
 					else
 						$query->addOrder(QueryOrder::desc('Active'));
 				}
-				break;
-				case 'updated':{
-					if($dir=='asc')
+					break;
+				case 'updated': {
+					if ($dir == 'asc')
 						$query->addOrder(QueryOrder::asc('LastEdited'));
 					else
 						$query->addOrder(QueryOrder::desc('LastEdited'));
 				}
-				break;
-				case 'updatedby':{
+					break;
+				case 'updatedby': {
 					$query->addAlias(QueryAlias::create('Member'));
-					if($dir=='asc')
+					if ($dir == 'asc')
 						$query->addOrder(QueryOrder::asc('Member.Email'));
 					else
 						$query->addOrder(QueryOrder::desc('Member.Email'));
 				}
-				break;
-				default:{
-				if($dir=='asc')
+					break;
+				default: {
+				if ($dir == 'asc')
 					$query->addOrder(QueryOrder::asc('ID'));
 				else
 					$query->addOrder(QueryOrder::desc('ID'));
@@ -533,115 +563,117 @@ class MarketPlaceAdminPage_Controller extends Page_Controller {
 			}
 		}
 		//get consultants
-		list($list,$size) = $this->consultant_repository->getAll($query,0,1000);
+		list($list, $size) = $this->consultant_repository->getAll($query, 0, 1000);
 		//return on view model
 		return new ArrayList($list);
 	}
 
-	public function getCurrentConsultant(){
-		$consultant_id    = intval($this->request->getVar('id'));
-		if($consultant_id > 0){
+	public function getCurrentConsultant()
+	{
+		$consultant_id = intval($this->request->getVar('id'));
+		if ($consultant_id > 0) {
 			return $this->consultant_repository->getById($consultant_id);
 		}
 		return false;
 	}
 
-	public function getCurrentConsultantJson(){
+	public function getCurrentConsultantJson()
+	{
 		$consultant = $this->getCurrentConsultant();
-		if($consultant){
+		if ($consultant) {
 			return json_encode(ConsultantAssembler::convertConsultantToArray($consultant));
 		}
 	}
 
-	public function getSortDir($type){
+	public function getSortDir($type)
+	{
 		$default = 'asc';
-		$dir     = Session::get($type.'.sort.dir');
-		if(empty($dir)){
+		$dir = Session::get($type . '.sort.dir');
+		if (empty($dir)) {
 			$dir = $default;
+		} else {
+			$dir = $dir == 'asc' ? 'desc' : 'asc';
 		}
-		else{
-			$dir = $dir=='asc'?'desc':'asc';
-		}
-		Session::set($type.'.sort.dir',$dir);
+		Session::set($type . '.sort.dir', $dir);
 		return $dir;
 	}
 
-	public function getDistributions(){
+	public function getDistributions()
+	{
 
-		if(!$this->canAdmin('implementations')){
-			return $this->httpError(401,'Unauthorized: you do not have the proper rights to access this page.');
+		if (!$this->canAdmin('implementations')) {
+			return $this->httpError(401, 'Unauthorized: you do not have the proper rights to access this page.');
 		}
 
-		$product_name           = trim(Convert::raw2sql($this->request->getVar('name')));
+		$product_name = trim(Convert::raw2sql($this->request->getVar('name')));
 		$implementation_type_id = intval($this->request->getVar('implementation_type_id'));
-		$company_id             = intval($this->request->getVar('company_id'));
+		$company_id = intval($this->request->getVar('company_id'));
 
-		$sort  = $this->request->getVar('sort');
+		$sort = $this->request->getVar('sort');
 		$query = new QueryObject(new CompanyService);
-		if(!empty($product_name)){
-			$query->addAddCondition(QueryCriteria::like('Name',$product_name));
+		if (!empty($product_name)) {
+			$query->addAddCondition(QueryCriteria::like('Name', $product_name));
 		}
-		if($implementation_type_id > 0){
-			$query->addAddCondition(QueryCriteria::equal('MarketPlaceType.ID',$implementation_type_id));
+		if ($implementation_type_id > 0) {
+			$query->addAddCondition(QueryCriteria::equal('MarketPlaceType.ID', $implementation_type_id));
 		}
-		if($company_id > 0){
-			$query->addAddCondition(QueryCriteria::equal('Company.ID',$company_id));
+		if ($company_id > 0) {
+			$query->addAddCondition(QueryCriteria::equal('Company.ID', $company_id));
 		}
 		//set sorting
-		if(!empty($sort)){
+		if (!empty($sort)) {
 			$dir = $this->getSortDir('distributions');
-			switch($sort){
-				case 'company':{
+			switch ($sort) {
+				case 'company': {
 					$query->addAlias(QueryAlias::create('Company'));
-					if($dir=='asc')
+					if ($dir == 'asc')
 						$query->addOrder(QueryOrder::asc('Company.Name'));
 					else
 						$query->addOrder(QueryOrder::desc('Company.Name'));
 				}
-				break;
-				case 'name':{
-					if($dir=='asc')
+					break;
+				case 'name': {
+					if ($dir == 'asc')
 						$query->addOrder(QueryOrder::asc('Name'));
 					else
 						$query->addOrder(QueryOrder::desc('Name'));
 				}
-				break;
-				case 'type':
-				{
+					break;
+				case 'type': {
 					$query->addAlias(QueryAlias::create('MarketPlaceType'));
-					if($dir=='asc')
+					if ($dir == 'asc')
 						$query->addOrder(QueryOrder::asc('MarketPlaceType.Name'));
 					else
 						$query->addOrder(QueryOrder::desc('MarketPlaceType.Name'));
 				}
-				break;
-				case 'status':{
-					if($dir=='asc')
+					break;
+				case 'status': {
+					if ($dir == 'asc')
 						$query->addOrder(QueryOrder::asc('Active'));
 					else
 						$query->addOrder(QueryOrder::desc('Active'));
 				}
-				break;
-				case 'updated':{
-					if($dir=='asc')
+					break;
+				case 'updated': {
+					if ($dir == 'asc')
 						$query->addOrder(QueryOrder::asc('LastEdited'));
 					else
 						$query->addOrder(QueryOrder::desc('LastEdited'));
 				}
-				break;
-				case 'updatedby':{
+					break;
+				case 'updatedby': {
 					$query->addAlias(QueryAlias::create('Member'));
-					if($dir=='asc')
+					if ($dir == 'asc')
 						$query->addOrder(QueryOrder::asc('Member.Email'));
 					else
 						$query->addOrder(QueryOrder::desc('Member.Email'));
 				}
-				break;
-				default:{
-					if($dir=='asc')
-						$query->addOrder(QueryOrder::asc('ID'));
-					else
-						$query->addOrder(QueryOrder::desc('ID'));
+					break;
+				default: {
+				if ($dir == 'asc')
+					$query->addOrder(QueryOrder::asc('ID'));
+				else
+					$query->addOrder(QueryOrder::desc('ID'));
 				}
 				break;
 			}
@@ -649,10 +681,10 @@ class MarketPlaceAdminPage_Controller extends Page_Controller {
 		//get distributions
 		$list1 = array();
 		$list2 = array();
-		if($this->canAdmin('distributions'))
-			list($list1,$size1) = $this->distribution_repository->getAll($query,0,1000);
-		if($this->canAdmin('appliances'))
-			list($list2,$size2) = $this->appliance_repository->getAll($query,0,1000);
+		if ($this->canAdmin('distributions'))
+			list($list1, $size1) = $this->distribution_repository->getAll($query, 0, 1000);
+		if ($this->canAdmin('appliances'))
+			list($list2, $size2) = $this->appliance_repository->getAll($query, 0, 1000);
 		//return on view model
 		return new ArrayList(array_merge($list1,$list2));
 	}
@@ -660,64 +692,65 @@ class MarketPlaceAdminPage_Controller extends Page_Controller {
 	/**
 	 * @return ArrayList
 	 */
-	public function getPublicClouds(){
+	public function getPublicClouds()
+	{
 
 		$product_name = trim(Convert::raw2sql($this->request->getVar('name')));
-		$company_id   = intval($this->request->getVar('company_id'));
-		$sort         = $this->request->getVar('sort');
-		$query        = new QueryObject(new CompanyService);
+		$company_id = intval($this->request->getVar('company_id'));
+		$sort = $this->request->getVar('sort');
+		$query = new QueryObject(new CompanyService);
 
-		if(!empty($product_name)){
-			$query->addAddCondition(QueryCriteria::like('Name',$product_name));
+		if (!empty($product_name)) {
+			$query->addAddCondition(QueryCriteria::like('Name', $product_name));
 		}
-		if($company_id > 0){
-			$query->addAddCondition(QueryCriteria::equal('Company.ID',$company_id));
+		if ($company_id > 0) {
+			$query->addAddCondition(QueryCriteria::equal('Company.ID', $company_id));
 		}
 
 		//set sorting
-		if(!empty($sort)){
+		if (!empty($sort)) {
 			$dir = $this->getSortDir('public.clouds');
 
-			switch($sort){
-				case 'company':{
+			switch ($sort) {
+				case 'company': {
 					$query->addAlias(QueryAlias::create('Company'));
-					if($dir=='asc')
+					if ($dir == 'asc')
 						$query->addOrder(QueryOrder::asc('Company.Name'));
 					else
 						$query->addOrder(QueryOrder::desc('Company.Name'));
 				}
-				break;
-				case 'name':{
-					if($dir=='asc')
+					break;
+				case 'name': {
+					if ($dir == 'asc')
 						$query->addOrder(QueryOrder::asc('Name'));
 					else
 						$query->addOrder(QueryOrder::desc('Name'));
 				}
-			    break;
-				case 'status':{
-					if($dir=='asc')
+					break;
+				case 'status': {
+					if ($dir == 'asc')
 						$query->addOrder(QueryOrder::asc('Active'));
 					else
 						$query->addOrder(QueryOrder::desc('Active'));
 				}
-				break;
-				case 'updated':{
-					if($dir=='asc')
+					break;
+				case 'updated': {
+					if ($dir == 'asc')
 						$query->addOrder(QueryOrder::asc('LastEdited'));
 					else
 						$query->addOrder(QueryOrder::desc('LastEdited'));
 				}
-				break;
-				case 'updatedby':{
+					break;
+				case 'updatedby': {
 					$query->addAlias(QueryAlias::create('Member'));
-					if($dir=='asc')
+					if ($dir == 'asc')
 						$query->addOrder(QueryOrder::asc('Member.Email'));
 					else
 						$query->addOrder(QueryOrder::desc('Member.Email'));
 				}
-				break;
-				default:{
-				if($dir=='asc')
+					break;
+				default: {
+				if ($dir == 'asc')
 					$query->addOrder(QueryOrder::asc('ID'));
 				else
 					$query->addOrder(QueryOrder::desc('ID'));
@@ -726,22 +759,24 @@ class MarketPlaceAdminPage_Controller extends Page_Controller {
 			}
 		}
 		//get public clouds
-		list($list,$size) = $this->public_clouds_repository->getAll($query,0,1000);
+		list($list, $size) = $this->public_clouds_repository->getAll($query, 0, 1000);
 		//return on view model
 		return new ArrayList($list);
 	}
 
-	public function getCurrentPublicCloud(){
-		$public_cloud_id    = intval($this->request->getVar('id'));
-		if($public_cloud_id > 0){
+	public function getCurrentPublicCloud()
+	{
+		$public_cloud_id = intval($this->request->getVar('id'));
+		if ($public_cloud_id > 0) {
 			return $this->public_clouds_repository->getById($public_cloud_id);
 		}
 		return false;
 	}
 
-	public function getCurrentPublicCloudJson(){
+	public function getCurrentPublicCloudJson()
+	{
 		$public_cloud = $this->getCurrentPublicCloud();
-		if($public_cloud){
+		if ($public_cloud) {
 			return json_encode(CloudAssembler::convertCloudToArray($public_cloud));
 		}
 	}
@@ -749,64 +784,65 @@ class MarketPlaceAdminPage_Controller extends Page_Controller {
 	/**
 	 * @return ArrayList
 	 */
-	public function getPrivateClouds(){
+	public function getPrivateClouds()
+	{
 
 		$product_name = trim(Convert::raw2sql($this->request->getVar('name')));
-		$company_id   = intval($this->request->getVar('company_id'));
-		$sort         = $this->request->getVar('sort');
-		$query        = new QueryObject(new CompanyService);
+		$company_id = intval($this->request->getVar('company_id'));
+		$sort = $this->request->getVar('sort');
+		$query = new QueryObject(new CompanyService);
 
-		if(!empty($product_name)){
-			$query->addAddCondition(QueryCriteria::like('Name',$product_name));
+		if (!empty($product_name)) {
+			$query->addAddCondition(QueryCriteria::like('Name', $product_name));
 		}
-		if($company_id > 0){
-			$query->addAddCondition(QueryCriteria::equal('Company.ID',$company_id));
+		if ($company_id > 0) {
+			$query->addAddCondition(QueryCriteria::equal('Company.ID', $company_id));
 		}
 
 		//set sorting
-		if(!empty($sort)){
+		if (!empty($sort)) {
 			$dir = $this->getSortDir('private.clouds');
 
-			switch($sort){
-				case 'company':{
+			switch ($sort) {
+				case 'company': {
 					$query->addAlias(QueryAlias::create('Company'));
-					if($dir=='asc')
+					if ($dir == 'asc')
 						$query->addOrder(QueryOrder::asc('Company.Name'));
 					else
 						$query->addOrder(QueryOrder::desc('Company.Name'));
 				}
 					break;
-				case 'name':{
-					if($dir=='asc')
+				case 'name': {
+					if ($dir == 'asc')
 						$query->addOrder(QueryOrder::asc('Name'));
 					else
 						$query->addOrder(QueryOrder::desc('Name'));
 				}
 					break;
-				case 'status':{
-					if($dir=='asc')
+				case 'status': {
+					if ($dir == 'asc')
 						$query->addOrder(QueryOrder::asc('Active'));
 					else
 						$query->addOrder(QueryOrder::desc('Active'));
 				}
 					break;
-				case 'updated':{
-					if($dir=='asc')
+				case 'updated': {
+					if ($dir == 'asc')
 						$query->addOrder(QueryOrder::asc('LastEdited'));
 					else
 						$query->addOrder(QueryOrder::desc('LastEdited'));
 				}
 					break;
-				case 'updatedby':{
+				case 'updatedby': {
 					$query->addAlias(QueryAlias::create('Member'));
-					if($dir=='asc')
+					if ($dir == 'asc')
 						$query->addOrder(QueryOrder::asc('Member.Email'));
 					else
 						$query->addOrder(QueryOrder::desc('Member.Email'));
 				}
 					break;
-				default:{
-				if($dir=='asc')
+				default: {
+				if ($dir == 'asc')
 					$query->addOrder(QueryOrder::asc('ID'));
 				else
 					$query->addOrder(QueryOrder::desc('ID'));
@@ -815,42 +851,40 @@ class MarketPlaceAdminPage_Controller extends Page_Controller {
 			}
 		}
 		//get public clouds
-		list($list,$size) = $this->private_clouds_repository->getAll($query,0,1000);
+		list($list, $size) = $this->private_clouds_repository->getAll($query, 0, 1000);
 		//return on view model
 		return new ArrayList($list);
 	}
 
-	public function getCurrentPrivateCloud(){
-		$private_cloud_id    = intval($this->request->getVar('id'));
-		if($private_cloud_id > 0){
+	public function getCurrentPrivateCloud()
+	{
+		$private_cloud_id = intval($this->request->getVar('id'));
+		if ($private_cloud_id > 0) {
 			return $this->private_clouds_repository->getById($private_cloud_id);
 		}
 		return false;
 	}
 
-	public function getCurrentPrivateCloudJson(){
+	public function getCurrentPrivateCloudJson()
+	{
 		$private_cloud = $this->getCurrentPrivateCloud();
-		if($private_cloud){
+		if ($private_cloud) {
 			return json_encode(CloudAssembler::convertCloudToArray($private_cloud));
 		}
 	}
 
-	public function getUsePricingSchema(){
-		$type_id  = intval($this->request->getVar('type_id'));
-		if($type_id > 0){
+	public function getUsePricingSchema()
+	{
+		$type_id = intval($this->request->getVar('type_id'));
+		if ($type_id > 0) {
 			$product_type = $this->marketplace_repository->getById($type_id);
-			if($product_type->getName() == IPublicCloudService::MarketPlaceType){
+			if ($product_type->getName() == IPublicCloudService::MarketPlaceType) {
 				return true;
 			}
 		}
 		return $this->getCurrentPublicCloud();
 	}
 
-	public function getPricingSchemas(){
-		list($list,$size) = $this->pricing_schema_repository->getAll(new QueryObject);
-		return new ArrayList($list);
-	}
-
 	public function getCountriesDDL($id="add-datacenter-location-country"){
 		$ddl = new CountryDropdownField($id,'Country');
 		$ddl->setEmptyString('-- select a country --');
@@ -859,12 +893,13 @@ class MarketPlaceAdminPage_Controller extends Page_Controller {
 		return $ddl;
 	}
 
-	public function canAdmin($entity){
-		switch(strtolower(trim($entity))){
+	public function canAdmin($entity)
+	{
+		switch (strtolower(trim($entity))) {
 			case 'implementations':
 				return
 					Member::currentUser()->isMarketPlaceTypeAdmin(IDistribution::MarketPlaceGroupSlug) ||
-				    Member::currentUser()->isMarketPlaceTypeAdmin(IAppliance::MarketPlaceGroupSlug);
+					Member::currentUser()->isMarketPlaceTypeAdmin(IAppliance::MarketPlaceGroupSlug);
 				break;
 			case 'appliances':
 				return Member::currentUser()->isMarketPlaceTypeAdmin(IAppliance::MarketPlaceGroupSlug);
@@ -885,7 +920,119 @@ class MarketPlaceAdminPage_Controller extends Page_Controller {
 		return false;
 	}
 
-	public function isSuperAdmin(){
+	public function isSuperAdmin()
+	{
 		return Member::currentUser()->isMarketPlaceSuperAdmin();
 	}
+
+	public function preview()
+	{
+
+		$marketplace_type = $this->request->param('MARKETPLACETYPE');
+		$instance_id = intval($this->request->param('ID'));
+
+		$query = new QueryObject();
+		$query->addAddCondition(QueryCriteria::equal('ID', $instance_id));
+		Requirements::block("marketplace/code/ui/admin/css/marketplace.admin.css");
+
+		Requirements::block(Director::protocol() . "code.jquery.com/ui/1.10.4/themes/smoothness/jquery-ui.css");
+
+		switch (strtolower($marketplace_type)) {
+			case 'distribution': {
+				$distribution = $this->distribution_repository->getBy($query);
+				if (!$distribution) throw new NotFoundEntityException('', '');
+				$render = new DistributionSapphireRender($distribution);
+				$distribution ->IsPreview = true;
+				return $render->draw();
+			}
+				break;
+			case 'appliance': {
+				$appliance = $this->appliance_repository->getBy($query);
+				$appliance->IsPreview = true;
+				$render = new ApplianceSapphireRender($appliance);
+				return $render->draw();
+			}
+				break;
+			case 'public_cloud': {
+				$public_cloud = $this->public_clouds_repository->getBy($query);
+				$public_cloud->IsPreview = true;
+				if (!$public_cloud) throw new NotFoundEntityException('', '');
+				$render = new PublicCloudSapphireRender($public_cloud);
+				return $render->draw();
+			}
+				break;
+			case 'private_cloud': {
+				$private_cloud = $this->private_clouds_repository->getBy($query);
+				$private_cloud->IsPreview = true;
+				$render = new PrivatgeCloudSapphireRender($private_cloud);
+				return $render->draw();
+
+			}
+				break;
+			case 'consultant': {
+				$consultant = $this->consultant_repository->getBy($query);
+				if (!$consultant) throw new NotFoundEntityException('', '');
+				$consultant->IsPreview = true;
+				$render = new ConsultantSapphireRender($consultant);
+				return $render->draw();
+			}
+				break;
+			default:
+				$this->httpError(404);
+				break;
+		}
+	}
+
+	public function getCurrentDataCenterLocationsJson()
+	{
+		$instance_id = intval($this->request->param('ID'));
+		$marketplace_type = $this->request->param('MARKETPLACETYPE');
+		$query = new QueryObject();
+		$query->addAddCondition(QueryCriteria::equal('ID', $instance_id));
+		switch (strtolower($marketplace_type)) {
+			case 'public_cloud': {
+				$cloud = $this->public_clouds_repository->getBy($query);
+			}
+				break;
+			case 'private_cloud': {
+				$cloud = $this->private_clouds_repository->getBy($query);
+			}
+				break;
+
+		}
+
+		if (!$cloud) throw new NotFoundEntityException('', '');
+		return CloudViewModel::getDataCenterLocationsJson($cloud);
+	}
+
+	public function getPricingSchemas()
+	{
+		return CloudViewModel::getPricingSchemas();
+	}
+
+	public function getEnabledPricingSchemas()
+	{
+		$instance_id = intval($this->request->param('ID'));
+		$marketplace_type = $this->request->param('MARKETPLACETYPE');
+		$query = new QueryObject();
+		$query->addAddCondition(QueryCriteria::equal('ID', $instance_id));
+		switch (strtolower($marketplace_type)) {
+			case 'public_cloud': {
+				$cloud = $this->public_clouds_repository->getBy($query);
+			}
+				break;
+			case 'private_cloud': {
+				$cloud = $this->private_clouds_repository->getBy($query);
+			}
+				break;
+
+		}
+		if (!$cloud) throw new NotFoundEntityException('', '');
+		return CloudViewModel::getEnabledPricingSchemas($cloud);
+	}
+
+	public function pdf(){
+
+	}
+
 }
\ No newline at end of file
diff --git a/marketplace/code/ui/frontend/CloudsDirectoryPage_Controller.php b/marketplace/code/ui/frontend/CloudsDirectoryPage_Controller.php
index c6d64b5..fc43090 100644
--- a/marketplace/code/ui/frontend/CloudsDirectoryPage_Controller.php
+++ b/marketplace/code/ui/frontend/CloudsDirectoryPage_Controller.php
@@ -249,32 +249,11 @@ abstract class CloudsDirectoryPage_Controller extends MarketPlaceDirectoryPage_C
 		$cloud       = $this->cloud_repository->getBy($query);
 		if(!$cloud) throw new NotFoundEntityException('','');
 		if($cloud->getCompany()->URLSegment != $company_url_segment) throw new NotFoundEntityException('','');
-		$locations = array();
-		foreach($cloud->getDataCentersLocations() as $location){
-			$json_data = array();
-			$json_data['country']  = Geoip::countryCode2name($location->getCountry());
-			$json_data['city']     = $location->getCity();
-			$json_data['lat']      = $location->getLat();
-			$json_data['lng']      = $location->getLng();
-			$json_data['color']    = $location->getDataCenterRegion()->getColor();
-			$json_data['endpoint'] = $location->getDataCenterRegion()->getEndpoint();
-			$json_data['zone']     = $location->getDataCenterRegion()->getName();
-			$json_data['availability_zones'] = array();
-			$json_data['product_name'] = $cloud->getName();
-			$json_data['owner']        = $cloud->getCompany()->getName();
-			foreach($location->getAvailabilityZones() as $az ){
-				$json_data_az = array();
-				$json_data_az['name'] = $az->getName();
-				array_push($json_data['availability_zones'],$json_data_az);
-			}
-			array_push($locations,$json_data);
-		}
-		return json_encode($locations);
+		return CloudViewModel::getDataCenterLocationsJson($cloud);
 	}
 
 	public function getPricingSchemas(){
-		list($list,$size ) = $pricing_schemas = $this->pricing_schema_repository->getAll(new QueryObject(),0,1000);
-		return new ArrayList($list);
+		return CloudViewModel::getPricingSchemas();
 	}
 
 	public function getEnabledPricingSchemas(){
@@ -282,22 +261,11 @@ abstract class CloudsDirectoryPage_Controller extends MarketPlaceDirectoryPage_C
 		$company_url_segment = Convert::raw2sql($params["Company"]);
 		$slug                = Convert::raw2sql($params["Slug"]);
 		$query               = new QueryObject();
-		$res                 = array();
 		$query->addAddCondition(QueryCriteria::equal('Slug',$slug));
 		$cloud       = $this->cloud_repository->getBy($query);
 		if(!$cloud) throw new NotFoundEntityException('','');
 		if($cloud->getCompany()->URLSegment != $company_url_segment) throw new NotFoundEntityException('','');
-		if(count($cloud->getCapabilities())>0){
-			$capabilities = $cloud->getCapabilities();
-			$enabled_pricing_schemas = reset($capabilities)->getPricingSchemas();
-			if(count($enabled_pricing_schemas)>0){
-
-				foreach($enabled_pricing_schemas as $ps){
-					array_push($res,$ps->getIdentifier());
-				}
-			}
-		}
-		return json_encode($res);
+		return CloudViewModel::getEnabledPricingSchemas($cloud);
 	}
 
 	public function ServicesCombo(){
diff --git a/marketplace/code/ui/frontend/ConsultantsDirectoryPage.php b/marketplace/code/ui/frontend/ConsultantsDirectoryPage.php
index 813ef01..7261fe7 100644
--- a/marketplace/code/ui/frontend/ConsultantsDirectoryPage.php
+++ b/marketplace/code/ui/frontend/ConsultantsDirectoryPage.php
@@ -143,25 +143,9 @@ class ConsultantsDirectoryPage_Controller extends MarketPlaceDirectoryPage_Contr
 			$consultant       = $this->consultant_repository->getBy($query);
 			if(!$consultant) throw new NotFoundEntityException('Consultant','by slug');
 			if($consultant->getCompany()->URLSegment != $company_url_segment) throw new NotFoundEntityException('','');
-			Requirements::javascript("marketplace/code/ui/frontend/js/consultant.page.js");
-			$services = $consultant->getServicesOffered();
-			$unique_services = array();
-			$unique_regions  = array();
-			foreach($services as $service){
-				if(!array_key_exists($service->getType(),$unique_services))
-					$unique_services[$service->getType()] = $service;
-				if(!array_key_exists($service->getRegionID(),$unique_regions)){
-					$region = $this->region_repository->getById($service->getRegionID());
-					$unique_regions[$service->getRegionID()]=$region;
-				}
-			}
-			return $this->Customise(
-				array(
-					'Consultant' => $consultant,
-					'Services'   => new ArrayList(array_values($unique_services)),
-					'Regions'    => new ArrayList(array_values($unique_regions)),
-				)
-			)->renderWith(array('ConsultantsDirectoryPage_consultant','ConsultantsDirectoryPage','MarketPlacePage'));
+
+			$render = new ConsultantSapphireRender($consultant);
+			return $render->draw($consultant);
 		}
 		catch (Exception $ex) {
 			return $this->httpError(404, 'Sorry that Consultant could not be found!.');
diff --git a/marketplace/code/ui/frontend/DistributionsDirectoryPage.php b/marketplace/code/ui/frontend/DistributionsDirectoryPage.php
index c76c076..0db90c4 100644
--- a/marketplace/code/ui/frontend/DistributionsDirectoryPage.php
+++ b/marketplace/code/ui/frontend/DistributionsDirectoryPage.php
@@ -156,9 +156,8 @@ class DistributionsDirectoryPage_Controller extends MarketPlaceDirectoryPage_Con
 			$distribution        = $this->distribution_repository->getBy($query);
 			if(!$distribution) throw new NotFoundEntityException('','');
 			if($distribution->getCompany()->URLSegment != $company_url_segment) throw new NotFoundEntityException('','');
-			Requirements::javascript("marketplace/code/ui/frontend/js/openstack.implementation.capabilities.js");
-			Requirements::javascript("marketplace/code/ui/frontend/js/implementation.page.js");
-			return $this->Customise($distribution)->renderWith(array('DistributionsDirectoryPage_implementation','DistributionsDirectoryPage','MarketPlacePage'));
+			$render = new DistributionSapphireRender($distribution);
+			return $render->draw();
 		}
 		catch (Exception $ex) {
 			return $this->httpError(404, 'Sorry that Distribution could not be found!.');
@@ -175,10 +174,8 @@ class DistributionsDirectoryPage_Controller extends MarketPlaceDirectoryPage_Con
 			$appliance  = $this->appliance_repository->getBy($query);
 			if(!$appliance) throw new NotFoundEntityException('','');
 			if($appliance->getCompany()->URLSegment != $company_url_segment) throw new NotFoundEntityException('','');
-			Requirements::javascript("marketplace/code/ui/frontend/js/openstack.implementation.capabilities.js");
-			Requirements::javascript("marketplace/code/ui/frontend/js/implementation.page.js");
-			//view is customized with same distributions templates
-			return $this->Customise($appliance)->renderWith(array('DistributionsDirectoryPage_implementation','DistributionsDirectoryPage','MarketPlacePage'));
+			$render = new ApplianceSapphirgit eRender($appliance);
+			return $render->draw();
 		}
 		catch (Exception $ex) {
 			return $this->httpError(404, 'Sorry that Appliance could not be found!.');
diff --git a/marketplace/code/ui/frontend/PrivateCloudsDirectoryPage.php b/marketplace/code/ui/frontend/PrivateCloudsDirectoryPage.php
index 63e1199..13d32fc 100644
--- a/marketplace/code/ui/frontend/PrivateCloudsDirectoryPage.php
+++ b/marketplace/code/ui/frontend/PrivateCloudsDirectoryPage.php
@@ -144,12 +144,11 @@ final class PrivateCloudsDirectoryPage_Controller extends CloudsDirectoryPage_Co
 			$slug                = Convert::raw2sql($params["Slug"]);
 			$query               = new QueryObject();
 			$query->addAddCondition(QueryCriteria::equal('Slug',$slug));
-			$public_cloud       = $this->cloud_repository->getBy($query);
-			if(!$public_cloud) throw new NotFoundEntityException('','');
-			if($public_cloud->getCompany()->URLSegment != $company_url_segment) throw new NotFoundEntityException('','');
-			Requirements::javascript("marketplace/code/ui/frontend/js/openstack.implementation.capabilities.js");
-			Requirements::javascript("marketplace/code/ui/frontend/js/cloud.page.js");
-			return $this->Customise($public_cloud)->renderWith(array('CloudsDirectoryPage_cloud','PrivateCloudsDirectoryPage','MarketPlacePage'));
+			$private_cloud       = $this->cloud_repository->getBy($query);
+			if(!$private_cloud) throw new NotFoundEntityException('','');
+			if($private_cloud->getCompany()->URLSegment != $company_url_segment) throw new NotFoundEntityException('','');
+			$render = new PrivateCloudSapphireRender($private_cloud);
+			return $render->draw();
 		}
 		catch (Exception $ex) {
 			return $this->httpError(404, 'Sorry that Private Cloud  could not be found!.');
diff --git a/marketplace/code/ui/frontend/PublicCloudsDirectoryPage.php b/marketplace/code/ui/frontend/PublicCloudsDirectoryPage.php
index f880b16..b31d157 100644
--- a/marketplace/code/ui/frontend/PublicCloudsDirectoryPage.php
+++ b/marketplace/code/ui/frontend/PublicCloudsDirectoryPage.php
@@ -149,9 +149,8 @@ class PublicCloudsDirectoryPage_Controller extends CloudsDirectoryPage_Controlle
 			$public_cloud       = $this->cloud_repository->getBy($query);
 			if(!$public_cloud) throw new NotFoundEntityException('','');
 			if($public_cloud->getCompany()->URLSegment != $company_url_segment) throw new NotFoundEntityException('','');
-			Requirements::javascript("marketplace/code/ui/frontend/js/openstack.implementation.capabilities.js");
-			Requirements::javascript("marketplace/code/ui/frontend/js/cloud.page.js");
-			return $this->Customise($public_cloud)->renderWith(array('CloudsDirectoryPage_cloud','PublicCloudsDirectoryPage','MarketPlacePage'));
+			$render             = new PublicCloudSapphireRender($public_cloud);
+			return $render->draw();
 		}
 		catch (Exception $ex) {
 			return $this->httpError(404, 'Sorry that Public Cloud  could not be found!.');
diff --git a/marketplace/code/ui/frontend/view_models/CloudViewModel.php b/marketplace/code/ui/frontend/view_models/CloudViewModel.php
new file mode 100644
index 0000000..09752dc
--- /dev/null
+++ b/marketplace/code/ui/frontend/view_models/CloudViewModel.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * Class CloudViewModel
+ */
+final class CloudViewModel {
+
+	public static function getDataCenterLocationsJson(ICloudService $cloud){
+		$locations = array();
+		foreach($cloud->getDataCentersLocations() as $location){
+			$json_data = array();
+			$json_data['country']  = Geoip::countryCode2name($location->getCountry());
+			$json_data['city']     = $location->getCity();
+			$json_data['lat']      = $location->getLat();
+			$json_data['lng']      = $location->getLng();
+			$json_data['color']    = $location->getDataCenterRegion()->getColor();
+			$json_data['endpoint'] = $location->getDataCenterRegion()->getEndpoint();
+			$json_data['zone']     = $location->getDataCenterRegion()->getName();
+			$json_data['availability_zones'] = array();
+			$json_data['product_name'] = $cloud->getName();
+			$json_data['owner']        = $cloud->getCompany()->getName();
+			foreach($location->getAvailabilityZones() as $az ){
+				$json_data_az = array();
+				$json_data_az['name'] = $az->getName();
+				array_push($json_data['availability_zones'],$json_data_az);
+			}
+			array_push($locations,$json_data);
+		}
+		return json_encode($locations);
+	}
+
+	public static function getPricingSchemas(){
+		$pricing_schema_repository = new SapphirePricingSchemaRepository;
+		list($list,$size ) = $pricing_schemas = $pricing_schema_repository->getAll(new QueryObject(),0,1000);
+		return new ArrayList($list);
+	}
+
+	public static function getEnabledPricingSchemas(ICloudService $cloud){
+	  $res = array();
+	  if(count($cloud->getCapabilities())>0){
+			$capabilities            = $cloud->getCapabilities();
+			$enabled_pricing_schemas = reset($capabilities)->getPricingSchemas();
+			if(count($enabled_pricing_schemas)>0){
+				foreach($enabled_pricing_schemas as $ps){
+					array_push($res,$ps->getIdentifier());
+				}
+			}
+		}
+		return json_encode($res);
+	}
+
+} 
\ No newline at end of file
diff --git a/marketplace/code/ui/utils/ApplianceSapphireRender.php b/marketplace/code/ui/utils/ApplianceSapphireRender.php
new file mode 100644
index 0000000..51104a5
--- /dev/null
+++ b/marketplace/code/ui/utils/ApplianceSapphireRender.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Class ApplianceSapphireRender
+ */
+final class ApplianceSapphireRender {
+
+	/**
+	 * @var IAppliance
+	 */
+	private $appliance;
+
+	public function __construct(IAppliance $appliance){
+		$this->appliance = $appliance;
+	}
+
+	public function draw(){
+		Requirements::javascript("marketplace/code/ui/frontend/js/openstack.implementation.capabilities.js");
+		Requirements::javascript("marketplace/code/ui/frontend/js/implementation.page.js");
+		Requirements::css("marketplace/code/ui/frontend/css/marketplace.css");
+		return Controller::curr()->Customise($this->appliance)->renderWith(array('DistributionsDirectoryPage_implementation', 'DistributionsDirectoryPage', 'MarketPlacePage'));
+	}
+} 
\ No newline at end of file
diff --git a/marketplace/code/ui/utils/ConsultantSapphireRender.php b/marketplace/code/ui/utils/ConsultantSapphireRender.php
new file mode 100644
index 0000000..9a07b59
--- /dev/null
+++ b/marketplace/code/ui/utils/ConsultantSapphireRender.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * Class ConsultantSapphireRender
+ */
+final class ConsultantSapphireRender {
+
+	/**
+	 * @var IConsultant
+	 */
+	private $consultant;
+
+	/**
+	 * @var IEntityRepository
+	 */
+	private $region_repository;
+
+	public function __construct(IConsultant $consultant){
+		$this->consultant        = $consultant;
+		$this->region_repository = new SapphireRegionRepository;
+	}
+
+	public function draw(){
+		Requirements::css("marketplace/code/ui/frontend/css/marketplace.css");
+		Requirements::javascript("marketplace/code/ui/frontend/js/consultant.page.js");
+		$services = $this->consultant->getServicesOffered();
+		$unique_services = array();
+		$unique_regions = array();
+		foreach ($services as $service) {
+			if (!array_key_exists($service->getType(), $unique_services))
+				$unique_services[$service->getType()] = $service;
+			if (!array_key_exists($service->getRegionID(), $unique_regions)) {
+				$region = $this->region_repository->getById($service->getRegionID());
+				$unique_regions[$service->getRegionID()] = $region;
+			}
+		}
+		return Controller::curr()->Customise(
+			array(
+				'Consultant' => $this->consultant,
+				'Services' => new ArrayList(array_values($unique_services)),
+				'Regions' => new ArrayList(array_values($unique_regions)),
+			)
+		)->renderWith(array('ConsultantsDirectoryPage_consultant', 'ConsultantsDirectoryPage', 'MarketPlacePage'));
+	}
+} 
\ No newline at end of file
diff --git a/marketplace/code/ui/utils/DistributionSapphireRender.php b/marketplace/code/ui/utils/DistributionSapphireRender.php
new file mode 100644
index 0000000..cc406cb
--- /dev/null
+++ b/marketplace/code/ui/utils/DistributionSapphireRender.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Class DistributionSapphireRender
+ */
+final class DistributionSapphireRender {
+
+	/**
+	 * @var IDistribution
+	 */
+	private $distribution;
+
+	public function __construct(IDistribution $distribution){
+		$this->distribution = $distribution;
+	}
+
+	public function draw(){
+		Requirements::javascript("marketplace/code/ui/frontend/js/openstack.implementation.capabilities.js");
+		Requirements::javascript("marketplace/code/ui/frontend/js/implementation.page.js");
+		Requirements::css("marketplace/code/ui/frontend/css/marketplace.css");
+		return Controller::curr()->Customise($this->distribution )->renderWith(array('DistributionsDirectoryPage_implementation', 'DistributionsDirectoryPage', 'MarketPlacePage'));
+	}
+} 
\ No newline at end of file
diff --git a/marketplace/code/ui/utils/PrivateCloudSapphireRender.php b/marketplace/code/ui/utils/PrivateCloudSapphireRender.php
new file mode 100644
index 0000000..a6f6b33
--- /dev/null
+++ b/marketplace/code/ui/utils/PrivateCloudSapphireRender.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Class PrivateCloudSapphireRender
+ */
+final class PrivateCloudSapphireRender {
+
+	/**
+	 * @var IPrivateCloudService
+	 */
+	private $cloud;
+
+	public function __construct(IPrivateCloudService $cloud){
+		$this->cloud = $cloud;
+	}
+
+	public function draw(){
+		Requirements::css("marketplace/code/ui/frontend/css/marketplace.css");
+		Requirements::javascript(Director::protocol() . "maps.googleapis.com/maps/api/js?sensor=false");
+		Requirements::javascript("marketplace/code/ui/admin/js/utils.js");
+		Requirements::javascript("marketplace/code/ui/frontend/js/markerclusterer.js");
+		Requirements::javascript("marketplace/code/ui/frontend/js/oms.min.js");
+		Requirements::javascript("marketplace/code/ui/frontend/js/infobubble-compiled.js");
+		Requirements::javascript("marketplace/code/ui/frontend/js/google.maps.jquery.js");
+		Requirements::javascript("themes/openstack/javascript/chosen.jquery.min.js");
+
+		Requirements::javascript("marketplace/code/ui/frontend/js/openstack.implementation.capabilities.js");
+		Requirements::javascript("marketplace/code/ui/frontend/js/cloud.page.js");
+		return Controller::curr()->Customise($this->cloud)->renderWith(array('CloudsDirectoryPage_cloud', 'PrivateCloudsDirectoryPage', 'MarketPlacePage'));
+	}
+} 
\ No newline at end of file
diff --git a/marketplace/code/ui/utils/PublicCloudSapphireRender.php b/marketplace/code/ui/utils/PublicCloudSapphireRender.php
new file mode 100644
index 0000000..4f8afa5
--- /dev/null
+++ b/marketplace/code/ui/utils/PublicCloudSapphireRender.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * Class PublicCloudSapphireRender
+ */
+final class PublicCloudSapphireRender {
+
+	/**
+	 * @var IPublicCloudService
+	 */
+	private $cloud;
+
+	public function __construct(IPublicCloudService $cloud){
+		$this->cloud = $cloud;
+	}
+
+	public function draw(){
+		Requirements::css("marketplace/code/ui/frontend/css/marketplace.css");
+		Requirements::javascript(Director::protocol() . "maps.googleapis.com/maps/api/js?sensor=false");
+		Requirements::javascript("marketplace/code/ui/admin/js/utils.js");
+		Requirements::javascript("marketplace/code/ui/frontend/js/markerclusterer.js");
+		Requirements::javascript("marketplace/code/ui/frontend/js/oms.min.js");
+		Requirements::javascript("marketplace/code/ui/frontend/js/infobubble-compiled.js");
+		Requirements::javascript("marketplace/code/ui/frontend/js/google.maps.jquery.js");
+
+		Requirements::javascript("marketplace/code/ui/frontend/js/openstack.implementation.capabilities.js");
+		Requirements::javascript("marketplace/code/ui/frontend/js/cloud.page.js");
+		return Controller::curr()->Customise($this->cloud)->renderWith(array('CloudsDirectoryPage_cloud', 'PublicCloudsDirectoryPage', 'MarketPlacePage'));
+	}
+} 
\ No newline at end of file
diff --git a/marketplace/templates/Layout/CloudsDirectoryPage_cloud.ss b/marketplace/templates/Layout/CloudsDirectoryPage_cloud.ss
index 215f625..e74dad9 100644
--- a/marketplace/templates/Layout/CloudsDirectoryPage_cloud.ss
+++ b/marketplace/templates/Layout/CloudsDirectoryPage_cloud.ss
@@ -129,7 +129,11 @@
     </div>
 </div>
 <div class="col-lg-6">
-        <% include MarketPlaceDirectoryPage_Rating %>
+        <% if IsPreview  %>
+            <% include MarketPlaceDirectoryPage_Rating_Placeholder %>
+        <% else %>
+            <% include MarketPlaceDirectoryPage_Rating %>
+        <% end_if %>
         <% if Videos %>
             <div id="videos">
                 <% loop Videos %>
diff --git a/marketplace/templates/Layout/ConsultantsDirectoryPage_consultant.ss b/marketplace/templates/Layout/ConsultantsDirectoryPage_consultant.ss
index ba97f42..b1c3c16 100644
--- a/marketplace/templates/Layout/ConsultantsDirectoryPage_consultant.ss
+++ b/marketplace/templates/Layout/ConsultantsDirectoryPage_consultant.ss
@@ -99,7 +99,11 @@
         </div>
     </div>
     <div class="col-lg-6">
-        <% include MarketPlaceDirectoryPage_Rating %>
+        <% if IsPreview  %>
+            <% include MarketPlaceDirectoryPage_Rating_Placeholder %>
+        <% else %>
+            <% include MarketPlaceDirectoryPage_Rating %>
+        <% end_if %>
         <% if Videos %>
             <div id="videos">
                 <% loop Videos %>
diff --git a/marketplace/templates/Layout/DistributionsDirectoryPage_implementation.ss b/marketplace/templates/Layout/DistributionsDirectoryPage_implementation.ss
index 33b9705..a2add33 100644
--- a/marketplace/templates/Layout/DistributionsDirectoryPage_implementation.ss
+++ b/marketplace/templates/Layout/DistributionsDirectoryPage_implementation.ss
@@ -77,7 +77,11 @@
     </div>
 </div>
 <div class="col-lg-6">
-    <% include MarketPlaceDirectoryPage_Rating %>
+    <% if IsPreview  %>
+        <% include MarketPlaceDirectoryPage_Rating_Placeholder %>
+    <% else %>
+        <% include MarketPlaceDirectoryPage_Rating %>
+    <% end_if %>
     <% if Videos %>
         <div id="videos">
         <% loop Videos %>
@@ -99,7 +103,6 @@
             </ul>
         </div>
     <% end_if %>
-
 </div>
 </div>
 </div>
\ No newline at end of file
diff --git a/marketplace/templates/Layout/Includes/MarketPlaceAdminPage_consultants_list.ss b/marketplace/templates/Layout/Includes/MarketPlaceAdminPage_consultants_list.ss
index 4a998c6..bc4f41f 100644
--- a/marketplace/templates/Layout/Includes/MarketPlaceAdminPage_consultants_list.ss
+++ b/marketplace/templates/Layout/Includes/MarketPlaceAdminPage_consultants_list.ss
@@ -76,6 +76,7 @@
                         <% end_if %>
                         <td style="min-width: 200px" width="30%">
                             <a class="product-button roundedButton addDeploymentBtn" href="$Top.Link(consultant)?id=$ID">Edit Product Details</a>
+                            <a target="_blank" class="product-button roundedButton addDeploymentBtn" href="$Top.Link(consultant)/$ID/preview">Preview Product</a>
                             <a class="roundedButton delete-consultant product-button addDeploymentBtn" href="#" data-id="{$ID}">Delete Product</a>
                         </td>
                     </tr>
diff --git a/marketplace/templates/Layout/Includes/MarketPlaceAdminPage_implementations_list.ss b/marketplace/templates/Layout/Includes/MarketPlaceAdminPage_implementations_list.ss
index b03b678..193c340 100644
--- a/marketplace/templates/Layout/Includes/MarketPlaceAdminPage_implementations_list.ss
+++ b/marketplace/templates/Layout/Includes/MarketPlaceAdminPage_implementations_list.ss
@@ -91,6 +91,7 @@
                         <% end_if %>
                         <td style="min-width: 200px" width="30%">
                             <a class="product-button roundedButton addDeploymentBtn" href="<% with MarketPlace  %><% if Name == "Appliance"  %>$Top.Link(appliance)<% end_if %><% if Name == "Distribution"  %>$Top.Link(distribution)<% end_if %><% end_with %>?id=$ID">Edit Product Details</a>
+                            <a target="_blank" class="product-button roundedButton addDeploymentBtn" href="<% with MarketPlace  %><% if Name == "Appliance"  %>$Top.Link(appliance)<% end_if %><% if Name == "Distribution"  %>$Top.Link(distribution)<% end_if %><% end_with %>/$ID/preview">Preview Product</a>
                             <a class="roundedButton delete-implementation product-button addDeploymentBtn" href="#"
                                data-id="{$ID}"
                                data-class="<% with MarketPlace  %><% if Name == "Appliance"  %>appliance<% end_if %><% if Name == "Distribution"  %>distribution<% end_if %><% end_with %>">Delete Product</a>
diff --git a/marketplace/templates/Layout/Includes/MarketPlaceAdminPage_private_clouds_list.ss b/marketplace/templates/Layout/Includes/MarketPlaceAdminPage_private_clouds_list.ss
index b18c940..a437847 100644
--- a/marketplace/templates/Layout/Includes/MarketPlaceAdminPage_private_clouds_list.ss
+++ b/marketplace/templates/Layout/Includes/MarketPlaceAdminPage_private_clouds_list.ss
@@ -76,6 +76,7 @@
                         <% end_if %>
                         <td style="min-width: 200px" width="30%">
                             <a class="product-button roundedButton addDeploymentBtn" href="$Top.Link(private_cloud)?id=$ID">Edit Product Details</a>
+                            <a target="_blank" class="product-button roundedButton addDeploymentBtn" href="$Top.Link(private_cloud)/$ID/preview">Preview Product</a>
                             <a class="roundedButton delete-private-cloud product-button addDeploymentBtn" href="#" data-id="{$ID}">Delete Product</a>
                         </td>
                     </tr>
diff --git a/marketplace/templates/Layout/Includes/MarketPlaceAdminPage_public_clouds_list.ss b/marketplace/templates/Layout/Includes/MarketPlaceAdminPage_public_clouds_list.ss
index afc40cb..9792495 100644
--- a/marketplace/templates/Layout/Includes/MarketPlaceAdminPage_public_clouds_list.ss
+++ b/marketplace/templates/Layout/Includes/MarketPlaceAdminPage_public_clouds_list.ss
@@ -76,6 +76,7 @@
                         <% end_if %>
                         <td style="min-width: 200px" width="30%">
                             <a class="product-button roundedButton addDeploymentBtn" href="$Top.Link(public_cloud)?id=$ID">Edit Product Details</a>
+                            <a target="_blank" class="product-button roundedButton addDeploymentBtn" href="$Top.Link(public_cloud)/$ID/preview">Preview Product</a>
                             <a class="roundedButton delete-public-cloud product-button addDeploymentBtn" href="#" data-id="{$ID}">Delete Product</a>
                         </td>
                     </tr>
diff --git a/marketplace/templates/Layout/Includes/MarketPlaceDirectoryPage_Rating_Placeholder.ss b/marketplace/templates/Layout/Includes/MarketPlaceDirectoryPage_Rating_Placeholder.ss
new file mode 100644
index 0000000..216bd97
--- /dev/null
+++ b/marketplace/templates/Layout/Includes/MarketPlaceDirectoryPage_Rating_Placeholder.ss
@@ -0,0 +1,8 @@
+<div id="reviews" style="min-height: 400px;">
+    <h3 style="color: #{$Company.CompanyColor} !important;">Reviews</h3>
+    <p>* No Reviews available on preview mode.</p>
+    <!--This script should be places anywhere on a page you want to see rating box-->
+    <div style='font-size:10px'>Powered by <a href="http://www.rating-system.com" target="_blank" title="Ratings and Reviews are powered by Rating-System.com">Rating-System.com</a>
+    </div>
+    <!-- DO NOT REMOVE THE LAST LINE, please contact us first if you need to do it -->
+</div>
\ No newline at end of file
diff --git a/marketplace/templates/Layout/MarketPlaceAdminPage_appliance.ss b/marketplace/templates/Layout/MarketPlaceAdminPage_appliance.ss
index 2819f2c..12b3aa8 100644
--- a/marketplace/templates/Layout/MarketPlaceAdminPage_appliance.ss
+++ b/marketplace/templates/Layout/MarketPlaceAdminPage_appliance.ss
@@ -3,6 +3,9 @@
     <div style="clear:both">
         <h1 style="width:50%;float:left;">Appliances - Product Details</h1>
         <a style="overflow:hidden;white-space: nowrap;font-weight:normal;float:right;margin-bottom:50px;text-align:center" class="roundedButton save-appliance" href="#" id="save-appliance">Save</a>
+        <% if CurrentAppliance %>
+            <a style="overflow:hidden;white-space: nowrap;font-weight:normal;float:right;margin-bottom:50px;text-align:center;margin-right:50px;" class="roundedButton addDeploymentBtn" target="_blank" href="$Top.Link(appliance)/$CurrentAppliance.ID/preview">Preview</a>
+        <% end_if %>
         <a style="overflow:hidden;white-space: nowrap;font-weight:normal;float:right;margin-bottom:50px;text-align:center;margin-right:50px;" class="roundedButton addDeploymentBtn" href="$Top.Link">&lt;&lt; Back to Products</a>
     </div>
     <div style="clear:both">
diff --git a/marketplace/templates/Layout/MarketPlaceAdminPage_consultant.ss b/marketplace/templates/Layout/MarketPlaceAdminPage_consultant.ss
index 1b868ac..f27ff5a 100644
--- a/marketplace/templates/Layout/MarketPlaceAdminPage_consultant.ss
+++ b/marketplace/templates/Layout/MarketPlaceAdminPage_consultant.ss
@@ -3,6 +3,9 @@
     <div style="clear:both">
         <h1 style="width:50%;float:left;">Consultant - Product Details</h1>
         <a style="overflow:hidden;white-space: nowrap;font-weight:normal;float:right;margin-bottom:50px;text-align:center" class="roundedButton save-consultant" href="#" id="save-consultant" name="save-consultant">Save</a>
+        <% if CurrentConsultant %>
+            <a style="overflow:hidden;white-space: nowrap;font-weight:normal;float:right;margin-bottom:50px;text-align:center;margin-right:50px;" class="roundedButton addDeploymentBtn" target="_blank" href="$Top.Link(consultant)/$CurrentConsultant.ID/preview">Preview</a>
+        <% end_if %>
         <a style="overflow:hidden;white-space: nowrap;font-weight:normal;float:right;margin-bottom:50px;text-align:center;margin-right:50px;" class="roundedButton addDeploymentBtn" href="$Top.Link(consultants)">&lt;&lt; Back to Products</a>
     </div>
     <div style="clear:both">
diff --git a/marketplace/templates/Layout/MarketPlaceAdminPage_distribution.ss b/marketplace/templates/Layout/MarketPlaceAdminPage_distribution.ss
index 5d07e7e..8fa6369 100644
--- a/marketplace/templates/Layout/MarketPlaceAdminPage_distribution.ss
+++ b/marketplace/templates/Layout/MarketPlaceAdminPage_distribution.ss
@@ -3,6 +3,9 @@
     <div style="clear:both">
         <h1 style="width:50%;float:left;">Distribution - Product Details</h1>
         <a style="overflow:hidden;white-space: nowrap;font-weight:normal;float:right;margin-bottom:50px;text-align:center" class="roundedButton save-distribution" href="#" id="save-distribution">Save</a>
+        <% if CurrentDistribution %>
+            <a style="overflow:hidden;white-space: nowrap;font-weight:normal;float:right;margin-bottom:50px;text-align:center;margin-right:50px;" class="roundedButton addDeploymentBtn" target="_blank" href="$Top.Link(distribution)/$CurrentDistribution.ID/preview">Preview</a>
+        <% end_if %>
         <a style="overflow:hidden;white-space: nowrap;font-weight:normal;float:right;margin-bottom:50px;text-align:center;margin-right:50px;" class="roundedButton addDeploymentBtn" href="$Top.Link">&lt;&lt; Back to Products</a>
     </div>
     <div style="clear:both">
diff --git a/marketplace/templates/Layout/MarketPlaceAdminPage_private_cloud.ss b/marketplace/templates/Layout/MarketPlaceAdminPage_private_cloud.ss
index f305fec..b0548b5 100644
--- a/marketplace/templates/Layout/MarketPlaceAdminPage_private_cloud.ss
+++ b/marketplace/templates/Layout/MarketPlaceAdminPage_private_cloud.ss
@@ -3,6 +3,9 @@
         <div style="clear:both">
             <h1 style="width:50%;float:left;">Private Cloud - Product Details</h1>
             <a style="overflow:hidden;white-space: nowrap;font-weight:normal;float:right;margin-bottom:50px;text-align:center" class="roundedButton save-private-cloud" href="#" id="save-private-cloud1">Save</a>
+            <% if CurrentPrivateCloud %>
+                <a style="overflow:hidden;white-space: nowrap;font-weight:normal;float:right;margin-bottom:50px;text-align:center;margin-right:50px;" class="roundedButton addDeploymentBtn" target="_blank" href="$Top.Link(private_cloud)/$CurrentPrivateCloud.ID/preview">Preview</a>
+            <% end_if %>
             <a style="overflow:hidden;white-space: nowrap;font-weight:normal;float:right;margin-bottom:50px;text-align:center;margin-right:50px;" class="roundedButton addDeploymentBtn" href="$Top.Link(private_clouds)">&lt;&lt; Back to Products</a>
         </div>
         <div style="clear:both">
diff --git a/marketplace/templates/Layout/MarketPlaceAdminPage_public_cloud.ss b/marketplace/templates/Layout/MarketPlaceAdminPage_public_cloud.ss
index 217c4a0..5d127fe 100644
--- a/marketplace/templates/Layout/MarketPlaceAdminPage_public_cloud.ss
+++ b/marketplace/templates/Layout/MarketPlaceAdminPage_public_cloud.ss
@@ -3,6 +3,9 @@
     <div style="clear:both">
         <h1 style="width:50%;float:left;">Public Cloud - Product Details</h1>
         <a style="overflow:hidden;white-space: nowrap;font-weight:normal;float:right;margin-bottom:50px;text-align:center" class="roundedButton save-public-cloud" href="#" id="save-public-cloud1">Save</a>
+        <% if CurrentPublicCloud %>
+            <a style="overflow:hidden;white-space: nowrap;font-weight:normal;float:right;margin-bottom:50px;text-align:center;margin-right:50px;" class="roundedButton addDeploymentBtn" target="_blank" href="$Top.Link(public_cloud)/$CurrentPublicCloud.ID/preview">Preview</a>
+        <% end_if %>
         <a style="overflow:hidden;white-space: nowrap;font-weight:normal;float:right;margin-bottom:50px;text-align:center;margin-right:50px;" class="roundedButton addDeploymentBtn" href="$Top.Link(public_clouds)">&lt;&lt; Back to Products</a>
     </div>
     <div style="clear:both">
diff --git a/marketplace/templates/MarketPlacePage.ss b/marketplace/templates/MarketPlacePage.ss
index 581c598..f57d0ea 100644
--- a/marketplace/templates/MarketPlacePage.ss
+++ b/marketplace/templates/MarketPlacePage.ss
@@ -18,18 +18,12 @@
     <link href='http://fonts.googleapis.com/css?family=Open+Sans:300,400,700' rel='stylesheet' type='text/css'>
 
     <!-- Framework CSS -->
-    <% if BootstrapConverted %>
-    <% else %>    
-      <link rel="stylesheet" href="/themes/openstack/css/blueprint/screen.css" type="text/css" media="screen, projection">
-    <% end_if %>
+
     <link rel="stylesheet" href="/themes/openstack/css/bootstrap.min.css" type="text/css" media="screen, projection">
 
 
     <!-- OpenStack Specific CSS -->
-    <% if BootstrapConverted %>
-    <% else %>
-      <link href="/themes/openstack/css/main.css" rel="stylesheet">
-    <% end_if %>
+
     <link href="/themes/openstack/css/combined.css" rel="stylesheet">
     <link rel="stylesheet" href="/themes/openstack/css/dropdown.css" type="text/css" media="screen, projection, print">
 
@@ -49,22 +43,13 @@
       <% include Navigation %>
       
       <!-- Page Content -->
-      <% if BootstrapConverted %>
+
         <div class="container">
             <% include MarketPlaceFrontendNav %>
         </div>
         $Message
         $Layout
         $Form
-      <% else %>
-        <div class="container">
-          <% include MarketPlaceFrontendNav %>
-          $Message
-          $Layout
-          $Form
-        </div>
-      <% end_if %>
-
 
     <% include Footer %>
     <% include Quantcast %>
diff --git a/themes/openstack/templates/Layout/SangriaPage_SetCategorySponsors.ss b/themes/openstack/templates/Layout/SangriaPage_SetCategorySponsors.ss
index 6ded3f4..b220738 100644
--- a/themes/openstack/templates/Layout/SangriaPage_SetCategorySponsors.ss
+++ b/themes/openstack/templates/Layout/SangriaPage_SetCategorySponsors.ss
@@ -1,7 +1,7 @@
 <div stlye="display:block;clear:both">
 	<h1>Set Category for Sponsors</h1>
     <% if SponsorsApproved %>
-        <% control SponsorsApproved %>
+        <% loop SponsorsApproved %>
         <ul>
             <li><h2>$CompanyName</h2>
             <form method="POST" action="/sangria/SetSponsorMarketplaces">
@@ -11,6 +11,6 @@
             </form>
             </li>
         </ul>
-        <% end_control %>
+        <% end_loop %>
     <% end_if %>
 </div>
diff --git a/themes/openstack/templates/Layout/SangriaPage_ViewSponsorsRequest.ss b/themes/openstack/templates/Layout/SangriaPage_ViewSponsorsRequest.ss
index 3664af1..4288055 100644
--- a/themes/openstack/templates/Layout/SangriaPage_ViewSponsorsRequest.ss
+++ b/themes/openstack/templates/Layout/SangriaPage_ViewSponsorsRequest.ss
@@ -1,11 +1,11 @@
 <div stlye="display:block;clear:both">
 	<h1>Sponsor Requests</h1>
     <% if SponsorsRequest %>
-	<% control SponsorsRequest %>
+	<% loop SponsorsRequest %>
 	<ul>
 		<li>$CompanyName</li>
 		<li><a href="sangria/SponsorApprove?sponsor_id=$ID">Approve or Reject</a></li>
 	</ul>
-	<% end_control %>
+	<% end_loop %>
     <% end_if %>
 </div>