Fixed display database stuff, optimized it