Added correct api requests and new design