Added border & outline

Added border & outline