Add back Menu button after cursor buttons

PS2: Code style
PS3: menuButtonTwo missing
PS4: fixing layout
PS5: getting closer and closer
PS6: best yet
PS7: commit name edit

Change-Id: Icec0d7a4a3348e1683e4974869d99edbe1fc1da7