Moving front-end to use grid