Moved spacing again, added comments, adjusted grid on index