done fixing ctid issue
refactoring master page
done basket refactoring
done master page refactoring