Layout Changes

To base and customer & product