Took over fix from latest ComponentJS
Moved button to align better to the general layout
Merged latest fixes from componentjs