Cleaned up sidebar directives
clean up directives, leave scroll and highlight unresolved