updated grid system

Still in testing, let me know if there are any strange things going on,
but should be better then the last one