Removed hasContent check and tab