Added missing GUI controls and validations, fixes #4