Move marginal ui code to a more standard layout