Continuation of dev and stable merging.

Contact selection through button selection
Search tags
UI fixes.