Changed grid system , working on Front-end