v2. improve layout & can save data now...