Top toolBar BugFix , Look & Feel Update