Some updates Still working on the modal window