Convert over to using a layout file

This will replace the individual fragments