Improved UI, add splitter