Visual bug fixed, db added