Various updates and basic layout