Add Universal layout (mostly for development)