More fixes : Layout