Mainly fix and cleanup

New toolbar button implementation.
Old code cleanup