layout changes
Fixing Issues