Assembler changes.

Changed a bit how the assembler worked, it was useless to have 2 buttons
that are just helpers for each other.  Fixed some namespace stuff.