Restructure market page