More refactoring of launcher and start button.