Refactored Utility and use  instead of window
Small bug fix in using isProd
New design