Completed MRC transition

Also removed dirty hacks to fix UI bugs from other tweaks; it's not my
duty to fix other tweaks.