deferred
optimized loading, rewrote sidebar
fixed merge conflict