Fixed modal bug and HUGE bug with database removal