Added some active record & a few design tweaks