Added comments and a border for field