Improve CSS
Add tag support for "q"