New Layout! Ready for testing!

GUI polished to be able to do user testing