Scaffolding for Add Contact screen + chat bubble layout fixes