Modularized grid and added basic modal