Added Annotations to Gui and InputCheck

Reviewed by: Simon
Merge origin/master