refactor & add design content