Fix basic layout