Tidying up the layout file

Makes all the analytic plugins optional and extracts them out of the layout.