Moved Grid, Font addition
Clean Up for Template