Idunnololz/fix expanding in wrap content layout