Refactored layout, markAsTemplate builder, help files