Fixed issue on Vertical due to new Grid