added border
removed todo