Various Design Fixes as per Jan.