Calculate consumption details in server
Cosmetic changes to frontend