Updated more UI and Resume