Modifications to enhance UX and loading image