Updated some of the modules and add debug layout to main