Tweaked controls a little more, added 'add button' functionality.