Implement and fix thesis underlining