Add some more todos
Introduce horizontal delimiters in sidebar