Added grid system
removed oldstyle