moved button to mainctrl
fixed merge
Merge pull request #31 from myclamm/mainCtrlLogin

moved button to mainctrl