Streamlined GUI a bit