database setup, minor layout changes