[Front-end] Made fixes to API Module