Fixed most layout issues - moved to new selectors