Cleaned more UI