Added System tab and other enhancements