sidebar trigger styling
completed merge
commented dummy data insert
fixed conflicts