Changed org parameter, layout and refresh of metrics