Fixed method of calculating leave and return time to reduce api calls and show quickly.