Added sexy border highlighting