Grid system finished + some name conventions changed