Functionality is almost complete then we just have to make the site more clean