UX Updated

More updates