diff --git a/spring-cli/samples/ui.groovy b/spring-cli/samples/ui.groovy
index 6a84cc0802..17153cbdeb 100644
--- a/spring-cli/samples/ui.groovy
+++ b/spring-cli/samples/ui.groovy
@@ -1,3 +1,5 @@
+package app
+
 @Grab("org.thymeleaf:thymeleaf-spring3:2.0.16")
 @Controller
 class Example {
diff --git a/spring-cli/src/test/resources/log4j.properties b/spring-cli/src/test/resources/log4j.properties
deleted file mode 100644
index 0591897a1b..0000000000
--- a/spring-cli/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-log4j.rootCategory=INFO, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n
-
-log4j.category.org.springframework.autoconfigure=DEBUG
-log4j.category.org.springframework.bootstrap=DEBUG
-#log4j.category.org.springframework.integration.dsl=DEBUG
-#log4j.category.org.springframework.amqp=DEBUG
diff --git a/spring-cli/src/test/resources/logback.xml b/spring-cli/src/test/resources/logback.xml
new file mode 100644
index 0000000000..8232e3a3cb
--- /dev/null
+++ b/spring-cli/src/test/resources/logback.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+	<property name="CONSOLE_LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } [%t] --- %-40.40logger{39} : %m%n%wex"/>
+
+	<conversionRule conversionWord="wex" converterClass="org.springframework.bootstrap.logging.logback.WhitespaceThrowableProxyConverter" />
+
+	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="CONSOLE" />
+	</root>
+	
+	<!-- logger name="org.springframework" level="DEBUG"/ -->
+	
+</configuration>
diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/main/resources/logback.xml b/spring-zero-samples/spring-zero-sample-actuator/src/main/resources/logback.xml
index 402304a693..8232e3a3cb 100644
--- a/spring-zero-samples/spring-zero-sample-actuator/src/main/resources/logback.xml
+++ b/spring-zero-samples/spring-zero-sample-actuator/src/main/resources/logback.xml
@@ -14,7 +14,6 @@
 		<appender-ref ref="CONSOLE" />
 	</root>
 	
-	<!--logger name="org.springframework.zero" level="DEBUG"/>
-	<logger name="org.springframework.security" level="DEBUG"/-->
+	<!-- logger name="org.springframework" level="DEBUG"/ -->
 	
 </configuration>
diff --git a/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/application.properties b/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/application.properties
new file mode 100644
index 0000000000..166fe14d5d
--- /dev/null
+++ b/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/application.properties
@@ -0,0 +1,2 @@
+# Allow Thymeleaf templates to be reloaded at dev time
+spring.template.cache: false
\ No newline at end of file
diff --git a/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/logback.xml b/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/logback.xml
new file mode 100644
index 0000000000..8232e3a3cb
--- /dev/null
+++ b/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/logback.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+	<property name="CONSOLE_LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %5p ${PID:- } [%t] --- %-40.40logger{39} : %m%n%wex"/>
+
+	<conversionRule conversionWord="wex" converterClass="org.springframework.bootstrap.logging.logback.WhitespaceThrowableProxyConverter" />
+
+	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="CONSOLE" />
+	</root>
+	
+	<!-- logger name="org.springframework" level="DEBUG"/ -->
+	
+</configuration>