Made Table go faster and fixed UI