3:46AM: New Layout and some testing