Added border + Refresh method