ui stuff

ui stuff
Nutrition done.
Merge remote-tracking branch 'marvin/master'