Fixed rendering of layout to include user metadata