layout fixes
layout fixes