Merged and styled Tung's screens, made Store into a modal