Reformat code
Fixed non persistant language selection