Edited styles, added filtered by text message
Merge origin/master