Fixed Toolbar Integration and reworked the Active display