Updated

Fixes:
- Fixed blank columns.
- Fixed editor not showing correct values.
Optimized code