CB

HTML should not be mixed inline with PHP. This makes it extremely complicated to maintain as HTML is just all over the place. ALL HTML should be in layouts. No matter how small a snippet it is make it a layout. This will make it significantly easier to maintain the HTML AND allow every layout to be overridden. This of course needs to happen after a layout API has been implemented and likely after several classes have been refactored.