Splitter is broken
Merge HexViewer changes