Buttons / Editor Fixes