Fixing more UI
Update UI some more