Add production ready code, and fix css calc()issue