replaced with fragments,added navbar