Displaying fix, integer restrictions refactoring