various user interface and organization improvements