Refactoring
Refactor time module
Refactor menu module