Fix Layout  issues