40% progress but fixed layout issues