Relocating `pre` setup and fixing rounded corners