Improved the way display works but I broke it, will fix next commit