Re-enable of code in Market and change of some view content

Re-enable of code in Market and change of some view content