More fixes
Some layout changes