Fixed spacing on tv view
Merge