StuP - repair NPE
StuP - Update layouts based on Jane's feedback
StuP - Update version number