cleanded code and fixed edittext in measurement and meals dialiog