Some changes to enhance the user experience