Display almost fixed
more fixed things