Refactor navigation bar translucence
Refactor switch returns