Merge pull request #644 from mc10/buttons

Move source button to right place (fixes #643)