Fixed errors & sidebar.

howdo merge?