Create branch conversation and unit test fixed (and minor css bug)