Updating class template
Adding basic grid; renaming some elements