Add refresh data button
refactor directives
Refactor nav
Use nested nav