Need to rename variables and connect with navbar