merge with timeline-messages
adjust timeline css
merge with timeline-no-tabs branch