more styling, changed filtering
merged sidebar