Changes for layout improvement