minor changes to sub toolbar and making list more modular