Menu completed, commets added, little refactor, small performance fix