Various layout fixes