Restructured for MVP and basic layout