Tweaked database layout and fixed grunt file