Fixed update Ajax issues and improved UI