Some changes on RBC layout