changed primary screen for dual mode
added todo element for the setup script
fixed regex to be a bit more valid