Revised the UI