UI / Button Improvement / Flow Grow