added card layout navigation
change structure