- minor toolbar button rearrange 
- adjusted debug logging