Empty field check in MainActivity is now working

+ some minor changes