Added Database support along with feedback grid layouts