Revert "fix layout issues with RBG", I fixed the bug in RBG, so don't need to fix things here anymore

This reverts commit 2c357fadd4287c0c0276764dd92defdb515df07f.