Improved button, and then lots more :X

Improved editing within shortcodes DRASTICALLY
Merge branch 'buttonImprovements'