RCSETUP: Fixing some layout issues