Working on billing section of front-end