- fixed the UI & backend logic
 - milestone 1 reached