Few more areas updated with proper object positioning