Small changes and settings buggy

Bug @ menu setting in MainActivity