Fixed checkstyle and item display