split UI files Fix issue #8