Whole lot of changes to display

buggy