Clean up debug messages
Added missing layout xml file for default theme
Updated TODO