sidebar && minor changes