Added text labels and fixed grid alignment issues