Updates to initial toolbar concept