styling
fixed sidebar filter issue
fixed merge issues