some package change and teacher ui using grid