Fixed issues as best as possible - missing text border