WPS-474 bringing back the previous look and feel and also fixing some data issues