* Minor Fixes in Layout