Updated UI & Added Modals
Updated SQL query