grid implementation on mockup page
code clean up