Fixing up the modal transition. Other minor fixes