Fixed Splitter & controls destruction

Fixed the control destruction and a problem with the splitter.
However, this is still un-satisfying and I will plan to perform some
code cleanup as soon as I can.