Fixed stack overflow

Also changed menu buttons