Fixed layout issues with alex recent changes