main menu refactoring + icons settings and calendar