improved routing structure, added dummy code for two other screens