UI Improvement

More professional UI