Preparation for reorg; a few interface fixes.

not the best class-name ever. Just call it .button, maybe? :)