Fix display issues
#25 Clean up toolbar.php