Clean up and basic layout