modified market design & added modal view