fixing the liquid grid system, moved the demo button, changed logo a little bit as well
fixed merging conflict