some layout changes
final for today