Minor refactoring
Added navigation adapter
Partial refactoring to main activity