Refactor navigation handling
Move Enum to Navigation, renamings
Rename ImageUtil methods