added yap, and moved the toolbar buttons