Grid Layout implemented
templateMapping improvements