New layout for integration/system testing

Unfortuanately, I was on a school computer at the time without the proper dev environment to test, so if this breaks, I apologize in advance.