Add adapter navigation
Restructure code