#008 - changed main screen logic