GridView added, input validation, minor commenting