diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 410865801..e68298ec1 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -14,3 +14,13 @@ Resolves #
 <!-- If this PR affects the UI, please include screenshots demonstrating the changes. -->
 
 <!-- Attribution: External code is properly credited. -->
+
+---
+
+### Format Checks
+<!-- If this PR contains files with format violations, run 'mvn spotless:apply' to fix them. -->
+
+> [!NOTE]
+> Files in PRs are automatically checked for format violations with `mvn spotless:check`.
+
+If this PR contains files with format violations, run `mvn spotless:apply` to fix them.
diff --git a/.github/workflows/maven-format-check.yml b/.github/workflows/maven-format-check.yml
new file mode 100644
index 000000000..5a2b6bbb3
--- /dev/null
+++ b/.github/workflows/maven-format-check.yml
@@ -0,0 +1,24 @@
+name: Maven Format Check
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        java: [17]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: ${{ matrix.java }}
+        cache: maven
+    - run: mvn clean
+    - run: mvn spotless:check
diff --git a/FUNDING_SPLITS.csv b/FUNDING_SPLITS.csv
index 28f2af6c8..98cb7a361 100644
--- a/FUNDING_SPLITS.csv
+++ b/FUNDING_SPLITS.csv
@@ -1,21 +1,21 @@
 ethereum_address,github_username,impact_percentage
-0x5D388Ec24Cc2C0C77458338696aa63AFB706A7b1,nya-elimu,45.86
-0xd46Cc93E3eE6a4fb532D9B48E95be7eD8f8f1DA0,jo-elimu,39.06
-0x342FaeB14127A79735144bbdC772AbB6b1bBe343,coderabbitai,3.58
-0x3965d420cde24fe00f742cb31257ca90e04556a7,tomaszsmy,1.01
-0x819e4F5E912abb36c8f6c03790e7508e03cc37a3,UmenR,0.95
+0x5D388Ec24Cc2C0C77458338696aa63AFB706A7b1,nya-elimu,45.57
+0xd46Cc93E3eE6a4fb532D9B48E95be7eD8f8f1DA0,jo-elimu,39.21
+0x342FaeB14127A79735144bbdC772AbB6b1bBe343,coderabbitai,3.69
+0x3965d420cde24fe00f742cb31257ca90e04556a7,tomaszsmy,1.00
+0x819e4F5E912abb36c8f6c03790e7508e03cc37a3,UmenR,0.94
 0x513DceE2929a6e0CD115fb65Ec926d6569d98aff,venkatesh2k3,0.82
 0x5367a6d4F5991327Bb20466684790e394bE000dE,Shubham-Vishwakarma,0.64
+0x4709ebf314c6492d57f4c6d4f57357d5b2bb074e,vrudas,0.62
 0x0000000000000000000000000000000000000000,aschworer,0.61
-0x4709ebf314c6492d57f4c6d4f57357d5b2bb074e,vrudas,0.59
-0x0000000000000000000000000000000000000000,SnehaHS65,0.50
-0x6321286F9B73f427C72e1f9F1bC6b3d25eF06605,hhio618,0.49
+0x0000000000000000000000000000000000000000,SnehaHS65,0.49
+0x6321286F9B73f427C72e1f9F1bC6b3d25eF06605,hhio618,0.48
 0x0000000000000000000000000000000000000000,urosht,0.48
-0x78888390AA08D9A25f3BDB8A1B35351D7c7F8a12,Bender-22,0.39
 0x0000000000000000000000000000000000000000,alexander-kuruvilla,0.40
+0x78888390AA08D9A25f3BDB8A1B35351D7c7F8a12,Bender-22,0.39
 0x914dBEe36BcAb63B2D15fAED08839Be43797b421,watr-sheep,0.32
 0x0000000000000000000000000000000000000000,eymaal,0.30
 0x0000000000000000000000000000000000000000,jpatel3,0.29
 0x38c19Bc91fC35f8bCAd07F177cC2F11098B1F3ff,vuriaval,0.29
 0x0000000000000000000000000000000000000000,Keerthi4308,0.29
-0x0000000000000000000000000000000000000000,SamehNoukary,0.24
+0x22d83d2681c8F04877b60F907D8288f011b314F8,Souvik-Cyclic,0.26
diff --git a/pom.xml b/pom.xml
index 535b1add2..61aedd748 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,19 +4,23 @@
     <groupId>ai.elimu</groupId>
     <artifactId>webapp</artifactId>
     <packaging>war</packaging>
-    <version>2.4.33-SNAPSHOT</version>
+    <version>2.4.35-SNAPSHOT</version>
 
     <properties>
-    	<java.version>17</java.version>
+        <java.version>17</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <model.version>2.0.73</model.version> <!-- https://jitpack.io/#elimu-ai/model -->
-        <hibernate.version>5.6.15.Final</hibernate.version> <!-- https://repo.maven.apache.org/maven2/org/hibernate/ -->
-        <jetty.version>10.0.22</jetty.version> <!-- https://repo.maven.apache.org/maven2/org/eclipse/jetty/ -->
-        <spring.version>5.3.18</spring.version> <!-- https://repo.maven.apache.org/maven2/org/springframework/ -->
-        <spring.security.version>5.6.2</spring.security.version> <!-- https://repo.maven.apache.org/maven2/org/springframework/security/ -->
-        <surefire-plugin.version>3.1.2</surefire-plugin.version> <!-- https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin/ -->
+        <model.version>2.0.73</model.version>
+        <hibernate.version>5.6.15.Final</hibernate.version>
+        <jetty.version>10.0.22</jetty.version>
+        <spring.version>5.3.18</spring.version>
+        <spring.security.version>5.6.2</spring.security.version>
+        <surefire-plugin.version>3.1.2</surefire-plugin.version>
     </properties>
 
+    <!-- Project Information -->
+    <name>webapp</name>
+    <url>http://localhost:8080/webapp</url>
+
     <!-- Build settings -->
     <build>
         <finalName>webapp-SNAPSHOT</finalName>
@@ -35,8 +39,8 @@
         </pluginManagement>
         <plugins>
             <plugin>
-            	<groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId> <!-- https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-compiler-plugin/ -->
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.11.0</version>
                 <configuration>
                     <source>${java.version}</source>
@@ -57,7 +61,7 @@
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId> <!-- https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-release-plugin/ -->
+                <artifactId>maven-release-plugin</artifactId>
                 <version>3.1.1</version>
                 <dependencies>
                     <dependency>
@@ -91,6 +95,26 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>com.diffplug.spotless</groupId>
+                <artifactId>spotless-maven-plugin</artifactId>
+                <version>2.43.0</version>
+                <configuration>
+                    <formats>
+                        <format>
+                            <includes>
+                                <include>**/*.java</include>
+                                <include>**/*.jsp</include>
+                                <include>**/*.xml</include>
+                            </includes>
+                            <indent>
+                                <spaces>true</spaces>
+                                <spacesPerTab>4</spacesPerTab>
+                            </indent>
+                        </format>
+                    </formats>
+                </configuration>
+            </plugin>
         </plugins>
         <resources>
             <resource>
@@ -110,19 +134,7 @@
         </resources>
      </build>
 
-    <!-- More Project Information -->
-    <name>webapp</name>
-    <url>http://localhost:8080/webapp</url>
-
     <!-- Environment Settings -->
-    <issueManagement>
-        <system>GitHub</system>
-        <url>https://github.com/orgs/elimu-ai/projects?query=is%3Aopen</url>
-    </issueManagement>
-    <ciManagement>
-        <system>GitHub Actions</system>
-        <url>https://github.com/elimu-ai/webapp/actions</url>
-    </ciManagement>
     <scm>
         <connection>scm:git:git@github.com:elimu-ai/webapp.git</connection>
         <developerConnection>scm:git:https://github.com/elimu-ai/webapp.git</developerConnection>
@@ -156,7 +168,7 @@
             <build>
                 <plugins>
                     <plugin>
-                    	<groupId>org.apache.maven.plugins</groupId>
+                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <version>${surefire-plugin.version}</version>
                         <configuration>
@@ -175,7 +187,7 @@
             <build>
                 <plugins>
                     <plugin>
-                    	<groupId>org.apache.maven.plugins</groupId>
+                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <version>${surefire-plugin.version}</version>
                         <configuration>
@@ -208,7 +220,7 @@
             <build>
                 <plugins>
                     <plugin>
-                    	<groupId>org.apache.maven.plugins</groupId>
+                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <version>${surefire-plugin.version}</version>
                         <configuration>
@@ -258,15 +270,15 @@
                         </executions>
                     </plugin>
                     <plugin>
-                    	<groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-war-plugin</artifactId> <!-- https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-war-plugin/ -->
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-war-plugin</artifactId>
                         <version>3.4.0</version>
                         <configuration>
                             <webXml>${basedir}/target/web.xml</webXml>
                         </configuration>
                     </plugin>
                     <plugin>
-                    	<groupId>org.apache.maven.plugins</groupId>
+                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <version>${surefire-plugin.version}</version>
                         <configuration>
@@ -278,284 +290,277 @@
         </profile>
     </profiles>
 
- <dependencies>
-  <dependency>
-   <groupId>com.github.elimu-ai</groupId>
-   <artifactId>model</artifactId>
-   <version>model-${model.version}</version>
-  </dependency>
-
-  <dependency>
-    <groupId>org.pmml4s</groupId>
-    <artifactId>pmml4s_3</artifactId>
-    <version>1.0.1</version>
-  </dependency>
-
-  <dependency>
-   <groupId>commons-fileupload</groupId>
-   <artifactId>commons-fileupload</artifactId>
-   <!-- https://repo.maven.apache.org/maven2/commons-fileupload/commons-fileupload/ -->
-   <version>1.4</version>
-  </dependency>
-
-  <!-- Spring Framework -->
-  <dependency>
-   <groupId>org.springframework</groupId>
-   <artifactId>spring-aspects</artifactId>
-   <version>${spring.version}</version>
-  </dependency>
-  <dependency>
-   <groupId>org.springframework</groupId>
-   <artifactId>spring-context</artifactId>
-   <version>${spring.version}</version>
-  </dependency>
-  <dependency>
-   <groupId>org.springframework</groupId>
-   <artifactId>spring-context-support</artifactId>
-   <version>${spring.version}</version>
-  </dependency>
-  <dependency>
-   <groupId>org.springframework</groupId>
-   <artifactId>spring-orm</artifactId>
-   <version>${spring.version}</version>
-  </dependency>
-  <dependency>
-   <groupId>org.springframework</groupId>
-   <artifactId>spring-oxm</artifactId>
-   <version>${spring.version}</version>
-  </dependency>
-  <dependency>
-   <groupId>org.springframework</groupId>
-   <artifactId>spring-web</artifactId>
-   <version>${spring.version}</version>
-  </dependency>
-  <dependency>
-   <groupId>org.springframework</groupId>
-   <artifactId>spring-webmvc</artifactId>
-   <version>${spring.version}</version>
-  </dependency>
-
-  <!-- Spring Security -->
-  <dependency>
-   <groupId>org.springframework.security</groupId>
-   <artifactId>spring-security-web</artifactId>
-   <version>${spring.security.version}</version>
-  </dependency>
-  <dependency>
-   <groupId>org.springframework.security</groupId>
-   <artifactId>spring-security-config</artifactId>
-   <version>${spring.security.version}</version>
-  </dependency>
-  <dependency>
-   <groupId>org.springframework.security</groupId>
-   <artifactId>spring-security-taglibs</artifactId>
-   <version>${spring.security.version}</version>
-  </dependency>
-
-  <dependency>
-   <groupId>com.github.scribejava</groupId>
-   <artifactId>scribejava-apis</artifactId>
-   <version>8.3.3</version>
-  </dependency>
-  <dependency>
-   <groupId>org.json</groupId>
-   <artifactId>json</artifactId>
-   <version>20231013</version>
-  </dependency>
+    <dependencies>
+        <!-- Internal -->
+        <dependency>
+            <groupId>com.github.elimu-ai</groupId>
+            <artifactId>model</artifactId>
+            <version>model-${model.version}</version>
+        </dependency>
 
-  <dependency>
-   <groupId>org.apache.logging.log4j</groupId>
-   <artifactId>log4j-api</artifactId>
-   <version>2.16.0</version>
-  </dependency>
-  <dependency>
-   <groupId>org.apache.logging.log4j</groupId>
-   <artifactId>log4j-core</artifactId>
-   <version>2.16.0</version>
-  </dependency>
-  <dependency>
-   <groupId>org.apache.logging.log4j</groupId>
-   <artifactId>log4j-web</artifactId>
-   <version>2.14.1</version>
-  </dependency>
+        <!-- Spring Framework -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aspects</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-oxm</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
 
-  <dependency>
-   <groupId>org.owasp.antisamy</groupId>
-   <artifactId>antisamy</artifactId>
-   <version>1.7.6</version>
-  </dependency>
+        <!-- Spring Security -->
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-web</artifactId>
+            <version>${spring.security.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-config</artifactId>
+            <version>${spring.security.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-taglibs</artifactId>
+            <version>${spring.security.version}</version>
+        </dependency>
 
-  <dependency>
-   <groupId>org.apache.httpcomponents.client5</groupId>
-   <artifactId>httpclient5</artifactId>
-   <version>5.3.1</version>
-  </dependency>
+        <!-- Log4j 2 -->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.16.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.16.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-web</artifactId>
+            <version>2.16.0</version>
+        </dependency>
 
-  <dependency>
-   <groupId>org.web3j</groupId>
-   <artifactId>core</artifactId>
-   <version>5.0.0</version>
-  </dependency>
+        <!-- Apache Commons -->
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.16.1</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-validator</groupId>
+            <artifactId>commons-validator</artifactId>
+            <version>1.9.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-csv</artifactId>
+            <version>1.9.0</version>
+        </dependency>
 
-  <dependency>
-   <groupId>org.aspectj</groupId>
-   <artifactId>aspectjweaver</artifactId>
-   <version>1.9.22.1</version>
-  </dependency>
+        <!-- AI/ML -->
+        <dependency>
+            <groupId>org.pmml4s</groupId>
+            <artifactId>pmml4s_3</artifactId>
+            <version>1.0.1</version>
+        </dependency>
 
-  <dependency>
-   <groupId>javax.validation</groupId>
-   <artifactId>validation-api</artifactId>
-   <version>2.0.1.Final</version>
-  </dependency>
-  <dependency>
-   <groupId>org.hibernate.validator</groupId>
-   <artifactId>hibernate-validator</artifactId>
-   <version>6.1.7.Final</version>
-  </dependency>
+        <dependency>
+            <groupId>com.github.scribejava</groupId>
+            <artifactId>scribejava-apis</artifactId>
+            <version>8.3.3</version>
+        </dependency>
 
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20231013</version>
+        </dependency>
 
+        <dependency>
+            <groupId>org.owasp.antisamy</groupId>
+            <artifactId>antisamy</artifactId>
+            <version>1.7.6</version>
+        </dependency>
 
-  <dependency>
-   <groupId>commons-lang</groupId>
-   <artifactId>commons-lang</artifactId>
-   <version>2.6</version>
-  </dependency>
-  <dependency>
-   <groupId>commons-io</groupId>
-   <artifactId>commons-io</artifactId>
-   <version>2.16.1</version>
-  </dependency>
-  <dependency>
-   <groupId>commons-validator</groupId>
-   <artifactId>commons-validator</artifactId>
-   <version>1.9.0</version>
-  </dependency>
-  <dependency>
-   <groupId>org.apache.commons</groupId>
-   <artifactId>commons-csv</artifactId>
-   <version>1.9.0</version>
-  </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>5.3.1</version>
+        </dependency>
 
-  <dependency>
-   <groupId>org.imgscalr</groupId>
-   <artifactId>imgscalr-lib</artifactId>
-   <version>4.2</version>
-  </dependency>
+        <dependency>
+            <groupId>org.web3j</groupId>
+            <artifactId>core</artifactId>
+            <version>5.0.0</version>
+        </dependency>
 
-  <dependency>
-   <groupId>com.googlecode.soundlibs</groupId>
-   <artifactId>jlayer</artifactId>
-   <version>1.0.1.4</version>
-   <exclusions>
-    <exclusion>
-     <groupId>junit</groupId>
-     <artifactId>junit</artifactId>
-    </exclusion>
-   </exclusions>
-  </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+            <version>1.9.22.1</version>
+        </dependency>
 
-  <dependency>
-   <groupId>com.googlecode.soundlibs</groupId>
-   <artifactId>tritonus-share</artifactId>
-   <version>0.3.7.4</version>
-  </dependency>
+        <dependency>
+            <groupId>org.imgscalr</groupId>
+            <artifactId>imgscalr-lib</artifactId>
+            <version>4.2</version>
+        </dependency>
 
-  <dependency>
-   <groupId>com.googlecode.soundlibs</groupId>
-   <artifactId>mp3spi</artifactId>
-   <version>1.9.5.4</version>
-  </dependency>
+        <!-- Audio -->
+        <dependency>
+            <groupId>com.googlecode.soundlibs</groupId>
+            <artifactId>jlayer</artifactId>
+            <version>1.0.1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.soundlibs</groupId>
+            <artifactId>tritonus-share</artifactId>
+            <version>0.3.7.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.soundlibs</groupId>
+            <artifactId>mp3spi</artifactId>
+            <version>1.9.5.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bitbucket.ijabz</groupId>
+            <artifactId>jaudiotagger</artifactId>
+            <version>3.0.1</version>
+        </dependency>
 
-  <dependency>
-   <groupId>com.googlecode.texhyphj</groupId>
-   <artifactId>texhyphj</artifactId>
-   <version>1.2</version>
-  </dependency>
+        <dependency>
+            <groupId>com.googlecode.texhyphj</groupId>
+            <artifactId>texhyphj</artifactId>
+            <version>1.2</version>
+        </dependency>
 
-  <dependency>
-   <groupId>net.dongliu</groupId>
-   <artifactId>apk-parser</artifactId>
-   <version>2.6.10</version>
-  </dependency>
+        <dependency>
+            <groupId>net.dongliu</groupId>
+            <artifactId>apk-parser</artifactId>
+            <version>2.6.10</version>
+        </dependency>
 
-  <dependency>
-   <groupId>org.hibernate</groupId>
-   <artifactId>hibernate-core</artifactId>
-   <version>${hibernate.version}</version>
-  </dependency>
-  <dependency>
-   <groupId>org.hibernate</groupId>
-   <artifactId>hibernate-entitymanager</artifactId>
-   <version>${hibernate.version}</version>
-  </dependency>
-  <dependency>
-   <groupId>org.hibernate</groupId>
-   <artifactId>hibernate-tools</artifactId>
-   <version>${hibernate.version}</version>
-  </dependency>
-  <dependency>
-   <groupId>javax.persistence</groupId>
-   <artifactId>javax.persistence-api</artifactId>
-   <version>2.2</version>
-  </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <version>1.2</version>
+        </dependency>
 
-  <dependency>
-   <groupId>javax.servlet</groupId>
-   <artifactId>jstl</artifactId>
-   <version>1.2</version>
-  </dependency>
+        <!-- Hibernate (ORM) -->
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${hibernate.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-entitymanager</artifactId>
+            <version>${hibernate.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-tools</artifactId>
+            <version>${hibernate.version}</version>
+        </dependency>
 
-  <!-- Audio Metadata -->
-  <dependency>
-   <groupId>org.bitbucket.ijabz</groupId>
-   <artifactId>jaudiotagger</artifactId>
-   <version>3.0.1</version>
-  </dependency>
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>6.1.7.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>2.0.1.Final</version>
+        </dependency>
 
-  <!-- Database -->
-  <dependency>
-   <groupId>javax.transaction</groupId>
-   <artifactId>jta</artifactId>
-   <version>1.1</version>
-  </dependency>
-  <dependency>
-   <groupId>org.hsqldb</groupId>
-   <artifactId>hsqldb</artifactId>
-   <version>2.7.3</version>
-  </dependency>
-  <dependency>
-   <groupId>mysql</groupId>
-   <artifactId>mysql-connector-java</artifactId>
-   <version>8.0.28</version>
-  </dependency>
-  <dependency>
-   <groupId>commons-dbcp</groupId>
-   <artifactId>commons-dbcp</artifactId>
-   <version>1.4</version>
-  </dependency>
+        <!-- Database -->
+        <dependency>
+            <groupId>javax.persistence</groupId>
+            <artifactId>javax.persistence-api</artifactId>
+            <version>2.2</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.transaction</groupId>
+            <artifactId>jta</artifactId>
+            <version>1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <version>2.7.3</version>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.30</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-dbcp</groupId>
+            <artifactId>commons-dbcp</artifactId>
+            <version>1.4</version>
+        </dependency>
 
-  <!-- provided -->
-  <dependency>
-   <groupId>javax.servlet</groupId>
-   <artifactId>javax.servlet-api</artifactId>
-   <version>4.0.1</version>
-   <scope>provided</scope>
-  </dependency>
-  <dependency>
-   <groupId>javax.servlet.jsp</groupId>
-   <artifactId>javax.servlet.jsp-api</artifactId>
-   <version>2.3.3</version>
-   <scope>provided</scope>
-  </dependency>
-  <dependency>
-   <groupId>org.junit.jupiter</groupId>
-   <artifactId>junit-jupiter</artifactId>
-   <version>5.10.3</version>
-   <scope>test</scope>
-  </dependency>
+        <!-- Provided by Jetty -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>4.0.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet.jsp</groupId>
+            <artifactId>javax.servlet.jsp-api</artifactId>
+            <version>2.3.3</version>
+            <scope>provided</scope>
+        </dependency>
 
-        <!-- test -->
+        <!-- Testing -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.10.3</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
diff --git a/src/main/java/ai/elimu/dao/AudioDao.java b/src/main/java/ai/elimu/dao/AudioDao.java
index d3dc5494b..8d732ad61 100644
--- a/src/main/java/ai/elimu/dao/AudioDao.java
+++ b/src/main/java/ai/elimu/dao/AudioDao.java
@@ -8,7 +8,7 @@
 import org.springframework.dao.DataAccessException;
 
 public interface AudioDao extends GenericDao<Audio> {
-	
+    
     Audio readByTitle(String title) throws DataAccessException;
     
     Audio readByTranscription(String transcription) throws DataAccessException;
diff --git a/src/main/java/ai/elimu/dao/ContributorDao.java b/src/main/java/ai/elimu/dao/ContributorDao.java
index 67623e3a8..f36914fdc 100644
--- a/src/main/java/ai/elimu/dao/ContributorDao.java
+++ b/src/main/java/ai/elimu/dao/ContributorDao.java
@@ -8,7 +8,7 @@
 import ai.elimu.model.contributor.Contributor;
 
 public interface ContributorDao extends GenericDao<Contributor> {
-	
+    
     Contributor read(String email) throws DataAccessException;
     
     Contributor readByProviderIdGitHub(String id) throws DataAccessException;
diff --git a/src/main/java/ai/elimu/dao/DbMigrationDao.java b/src/main/java/ai/elimu/dao/DbMigrationDao.java
index 84ae77cc7..dbd3605fb 100644
--- a/src/main/java/ai/elimu/dao/DbMigrationDao.java
+++ b/src/main/java/ai/elimu/dao/DbMigrationDao.java
@@ -6,7 +6,7 @@
 import org.springframework.dao.DataAccessException;
 
 public interface DbMigrationDao extends GenericDao<DbMigration> {
-	
+    
     DbMigration read(Integer version) throws DataAccessException;
     
     List<DbMigration> readAllOrderedByVersionDesc() throws DataAccessException;
diff --git a/src/main/java/ai/elimu/dao/DeviceDao.java b/src/main/java/ai/elimu/dao/DeviceDao.java
index a5934039b..5e7ca1bd6 100644
--- a/src/main/java/ai/elimu/dao/DeviceDao.java
+++ b/src/main/java/ai/elimu/dao/DeviceDao.java
@@ -5,6 +5,6 @@
 import org.springframework.dao.DataAccessException;
 
 public interface DeviceDao extends GenericDao<Device> {
-	
+    
     Device read(String androidId) throws DataAccessException;
 }
diff --git a/src/main/java/ai/elimu/dao/ImageDao.java b/src/main/java/ai/elimu/dao/ImageDao.java
index 5638ae9fc..375352684 100644
--- a/src/main/java/ai/elimu/dao/ImageDao.java
+++ b/src/main/java/ai/elimu/dao/ImageDao.java
@@ -8,7 +8,7 @@
 import ai.elimu.model.content.multimedia.Image;
 
 public interface ImageDao extends GenericDao<Image> {
-	
+    
     Image read(String title) throws DataAccessException;
 
     List<Image> readAllOrdered() throws DataAccessException;
diff --git a/src/main/java/ai/elimu/dao/NumberDao.java b/src/main/java/ai/elimu/dao/NumberDao.java
index 612ec0ddd..49d61cc01 100644
--- a/src/main/java/ai/elimu/dao/NumberDao.java
+++ b/src/main/java/ai/elimu/dao/NumberDao.java
@@ -7,7 +7,7 @@
 import org.springframework.dao.DataAccessException;
 
 public interface NumberDao extends GenericDao<Number> {
-	
+    
     Number readByValue(Integer value) throws DataAccessException;
 
     List<Number> readAllOrdered() throws DataAccessException;
diff --git a/src/main/java/ai/elimu/dao/SoundDao.java b/src/main/java/ai/elimu/dao/SoundDao.java
index e31fa5bd1..3146847bb 100644
--- a/src/main/java/ai/elimu/dao/SoundDao.java
+++ b/src/main/java/ai/elimu/dao/SoundDao.java
@@ -6,7 +6,7 @@
 import org.springframework.dao.DataAccessException;
 
 public interface SoundDao extends GenericDao<Sound> {
-	
+    
     Sound readByValueIpa(String value) throws DataAccessException;
     
     Sound readByValueSampa(String value) throws DataAccessException;
diff --git a/src/main/java/ai/elimu/dao/StoryBookChapterDao.java b/src/main/java/ai/elimu/dao/StoryBookChapterDao.java
index def6ea6c2..b646aeeee 100644
--- a/src/main/java/ai/elimu/dao/StoryBookChapterDao.java
+++ b/src/main/java/ai/elimu/dao/StoryBookChapterDao.java
@@ -7,6 +7,6 @@
 import org.springframework.dao.DataAccessException;
 
 public interface StoryBookChapterDao extends GenericDao<StoryBookChapter> {
-	
+    
     List<StoryBookChapter> readAll(StoryBook storyBook) throws DataAccessException;
 }
diff --git a/src/main/java/ai/elimu/dao/StoryBookDao.java b/src/main/java/ai/elimu/dao/StoryBookDao.java
index 53b00aa57..5c5b0f339 100644
--- a/src/main/java/ai/elimu/dao/StoryBookDao.java
+++ b/src/main/java/ai/elimu/dao/StoryBookDao.java
@@ -8,7 +8,7 @@
 import org.springframework.dao.DataAccessException;
 
 public interface StoryBookDao extends GenericDao<StoryBook> {
-	
+    
     StoryBook readByTitle(String title) throws DataAccessException;
 
     List<StoryBook> readAllOrdered() throws DataAccessException;
diff --git a/src/main/java/ai/elimu/dao/StoryBookParagraphDao.java b/src/main/java/ai/elimu/dao/StoryBookParagraphDao.java
index 5dbb99731..007867115 100644
--- a/src/main/java/ai/elimu/dao/StoryBookParagraphDao.java
+++ b/src/main/java/ai/elimu/dao/StoryBookParagraphDao.java
@@ -7,7 +7,7 @@
 import org.springframework.dao.DataAccessException;
 
 public interface StoryBookParagraphDao extends GenericDao<StoryBookParagraph> {
-	
+    
     List<StoryBookParagraph> readAll(StoryBookChapter storyBookChapter) throws DataAccessException;
     
     List<StoryBookParagraph> readAllContainingWord(String wordText) throws DataAccessException;
diff --git a/src/main/java/ai/elimu/dao/VideoDao.java b/src/main/java/ai/elimu/dao/VideoDao.java
index 75e630b2e..66264c7b4 100644
--- a/src/main/java/ai/elimu/dao/VideoDao.java
+++ b/src/main/java/ai/elimu/dao/VideoDao.java
@@ -6,7 +6,7 @@
 import org.springframework.dao.DataAccessException;
 
 public interface VideoDao extends GenericDao<Video> {
-	
+    
     Video read(String title) throws DataAccessException;
 
     List<Video> readAllOrdered() throws DataAccessException;
diff --git a/src/main/java/ai/elimu/dao/WordDao.java b/src/main/java/ai/elimu/dao/WordDao.java
index 4b9f0f2e7..18550b667 100644
--- a/src/main/java/ai/elimu/dao/WordDao.java
+++ b/src/main/java/ai/elimu/dao/WordDao.java
@@ -8,7 +8,7 @@
 import org.springframework.dao.DataAccessException;
 
 public interface WordDao extends GenericDao<Word> {
-	
+    
     Word readByText(String text) throws DataAccessException;
 
     Word readByTextAndType(String text, WordType wordType) throws DataAccessException;
diff --git a/src/main/java/ai/elimu/dao/jpa/GenericDaoJpa.java b/src/main/java/ai/elimu/dao/jpa/GenericDaoJpa.java
index 9f83fb950..cdbb62538 100644
--- a/src/main/java/ai/elimu/dao/jpa/GenericDaoJpa.java
+++ b/src/main/java/ai/elimu/dao/jpa/GenericDaoJpa.java
@@ -18,7 +18,7 @@
 @Repository
 @Transactional
 public class GenericDaoJpa<T> implements GenericDao<T> {
-	
+    
     @PersistenceContext
     protected EntityManager em;
 
diff --git a/src/main/java/ai/elimu/util/LetterFrequencyHelper.java b/src/main/java/ai/elimu/util/LetterFrequencyHelper.java
index d4810360d..0527af78f 100644
--- a/src/main/java/ai/elimu/util/LetterFrequencyHelper.java
+++ b/src/main/java/ai/elimu/util/LetterFrequencyHelper.java
@@ -35,7 +35,7 @@ public int compare(Map.Entry<String, Integer> m1, Map.Entry<String, Integer> m2)
                 return (m2.getValue()).compareTo(m1.getValue());
             }
         });
-    	
+        
         Map<String, Integer> result = new LinkedHashMap<String, Integer>();
         for (Map.Entry<String, Integer> entry : list) {
             result.put(entry.getKey(), entry.getValue());
diff --git a/src/main/java/ai/elimu/util/SyllableFrequencyHelper.java b/src/main/java/ai/elimu/util/SyllableFrequencyHelper.java
index b2f0ef3cf..ffc16c996 100644
--- a/src/main/java/ai/elimu/util/SyllableFrequencyHelper.java
+++ b/src/main/java/ai/elimu/util/SyllableFrequencyHelper.java
@@ -42,7 +42,7 @@ private static Map<String, Integer> sortByValue(Map<String, Integer> map) {
         List<Map.Entry<String, Integer>> list = new LinkedList<Map.Entry<String, Integer>>(map.entrySet());
 
         list.sort((m1, m2) -> (m2.getValue()).compareTo(m1.getValue()));
-    	
+        
         Map<String, Integer> result = new LinkedHashMap<>();
         for (Map.Entry<String, Integer> entry : list) {
             result.put(entry.getKey(), entry.getValue());
diff --git a/src/main/java/ai/elimu/util/WordFrequencyHelper.java b/src/main/java/ai/elimu/util/WordFrequencyHelper.java
index 1e13b35cb..352b6fc63 100644
--- a/src/main/java/ai/elimu/util/WordFrequencyHelper.java
+++ b/src/main/java/ai/elimu/util/WordFrequencyHelper.java
@@ -30,7 +30,7 @@ private static Map<String, Integer> sortByValue(Map<String, Integer> map) {
         List<Map.Entry<String, Integer>> list = new LinkedList<Map.Entry<String, Integer>>(map.entrySet());
 
         list.sort((m1, m2) -> (m2.getValue()).compareTo(m1.getValue()));
-    	
+        
         Map<String, Integer> result = new LinkedHashMap<String, Integer>();
         for (Map.Entry<String, Integer> entry : list) {
             result.put(entry.getKey(), entry.getValue());
diff --git a/src/main/java/ai/elimu/web/CustomAuthenticationManager.java b/src/main/java/ai/elimu/web/CustomAuthenticationManager.java
index 42cf9fa5c..98df76421 100644
--- a/src/main/java/ai/elimu/web/CustomAuthenticationManager.java
+++ b/src/main/java/ai/elimu/web/CustomAuthenticationManager.java
@@ -16,7 +16,7 @@
 import org.springframework.security.core.context.SecurityContextHolder;
 
 public class CustomAuthenticationManager implements AuthenticationManager {
-	
+    
     private Logger logger = LogManager.getLogger();
 
     private final List<GrantedAuthority> AUTHORITIES = new ArrayList<GrantedAuthority>();
diff --git a/src/main/java/ai/elimu/web/SignOnController.java b/src/main/java/ai/elimu/web/SignOnController.java
index eb069cdc4..37d43a0d9 100644
--- a/src/main/java/ai/elimu/web/SignOnController.java
+++ b/src/main/java/ai/elimu/web/SignOnController.java
@@ -29,8 +29,8 @@ public class SignOnController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model) {
-    	logger.debug("handleRequest");
-    	
+        logger.debug("handleRequest");
+        
         return "sign-on";
     }
 
@@ -40,7 +40,7 @@ public String handleRequest(Model model) {
      */
     @RequestMapping("/offline")
     public String handleOfflineSignOnRequest(HttpServletRequest request) {
-    	logger.info("handleOfflineSignOnRequest");
+        logger.info("handleOfflineSignOnRequest");
         
         if (EnvironmentContextLoaderListener.env == Environment.DEV) {
             // Fetch the test user that was created in DbContentImportHelper during application launch
diff --git a/src/main/java/ai/elimu/web/SignOnControllerDiscord.java b/src/main/java/ai/elimu/web/SignOnControllerDiscord.java
index 98de350ce..a5a3ca0dd 100644
--- a/src/main/java/ai/elimu/web/SignOnControllerDiscord.java
+++ b/src/main/java/ai/elimu/web/SignOnControllerDiscord.java
@@ -81,7 +81,7 @@ public String handleAuthorization(HttpServletRequest request) throws IOException
                 .build();
         logger.info("Redirecting to the Authorization URL: " + authorizationUrl);
         logger.info("Got the Authorization URL!");
-		
+        
         return "redirect:" + authorizationUrl;
     }
 
diff --git a/src/main/java/ai/elimu/web/SignOnControllerGitHub.java b/src/main/java/ai/elimu/web/SignOnControllerGitHub.java
index 5ec6dd2c8..00997bc88 100644
--- a/src/main/java/ai/elimu/web/SignOnControllerGitHub.java
+++ b/src/main/java/ai/elimu/web/SignOnControllerGitHub.java
@@ -82,7 +82,7 @@ public String handleAuthorization(HttpServletRequest request) throws IOException
                 .state(secretState)
                 .build();
         logger.info("Got the Authorization URL!");
-		
+        
         return "redirect:" + authorizationUrl;
     }
     
diff --git a/src/main/java/ai/elimu/web/SignOnControllerSelenium.java b/src/main/java/ai/elimu/web/SignOnControllerSelenium.java
index 1f2b8dab4..645790abc 100644
--- a/src/main/java/ai/elimu/web/SignOnControllerSelenium.java
+++ b/src/main/java/ai/elimu/web/SignOnControllerSelenium.java
@@ -49,7 +49,7 @@ public String handleRequest(
         contributor.setFirstName("TestRole");
         contributor.setLastName(role.toString());
         contributor.setMotivation("Regression testing as " + role);
-				
+                
         Contributor existingContributor = contributorDao.read(contributor.getEmail());
         logger.info("existingContributor: " + existingContributor);
         if (existingContributor != null) {
@@ -64,7 +64,7 @@ public String handleRequest(
 
         // Add Contributor object to session
         request.getSession().setAttribute("contributor", contributor);
-	        	
+                
         return "redirect:/content";
     }
 }
diff --git a/src/main/java/ai/elimu/web/SignOnControllerWeb3.java b/src/main/java/ai/elimu/web/SignOnControllerWeb3.java
index 7ab7f7d1d..ffd50cbb0 100644
--- a/src/main/java/ai/elimu/web/SignOnControllerWeb3.java
+++ b/src/main/java/ai/elimu/web/SignOnControllerWeb3.java
@@ -36,7 +36,7 @@ public class SignOnControllerWeb3 {
     @RequestMapping(value="/sign-on/web3", method=RequestMethod.GET)
     public String handleGetRequest(HttpServletRequest request) throws IOException {
         logger.info("handleGetRequest");
-		
+        
         return "sign-on-web3";
     }
     
diff --git a/src/main/java/ai/elimu/web/WelcomeController.java b/src/main/java/ai/elimu/web/WelcomeController.java
index 39276ef3a..86e517182 100644
--- a/src/main/java/ai/elimu/web/WelcomeController.java
+++ b/src/main/java/ai/elimu/web/WelcomeController.java
@@ -13,8 +13,8 @@ public class WelcomeController {
 
     @RequestMapping("/")
     public String handleRequest(Model model) {
-    	logger.info("handleRequest");
-    	
+        logger.info("handleRequest");
+        
         return "welcome";
     }
 }
diff --git a/src/main/java/ai/elimu/web/admin/MainAdminController.java b/src/main/java/ai/elimu/web/admin/MainAdminController.java
index 976d275ad..ad1b57fab 100644
--- a/src/main/java/ai/elimu/web/admin/MainAdminController.java
+++ b/src/main/java/ai/elimu/web/admin/MainAdminController.java
@@ -20,10 +20,10 @@ public class MainAdminController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         model.addAttribute("applicationCount", applicationDao.readCount());
-    	
+        
         return "admin/main";
     }
 }
diff --git a/src/main/java/ai/elimu/web/admin/application/ApplicationCreateController.java b/src/main/java/ai/elimu/web/admin/application/ApplicationCreateController.java
index eb24e19c9..c803dbc87 100644
--- a/src/main/java/ai/elimu/web/admin/application/ApplicationCreateController.java
+++ b/src/main/java/ai/elimu/web/admin/application/ApplicationCreateController.java
@@ -28,7 +28,7 @@ public class ApplicationCreateController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         Application application = new Application();
         application.setApplicationStatus(ApplicationStatus.MISSING_APK);
@@ -47,7 +47,7 @@ public String handleSubmit(
             BindingResult result,
             Model model
     ) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         Application existingApplication = applicationDao.readByPackageName(application.getPackageName());
         if (existingApplication != null) {
diff --git a/src/main/java/ai/elimu/web/admin/application/ApplicationEditController.java b/src/main/java/ai/elimu/web/admin/application/ApplicationEditController.java
index 4f57db38f..c616738fa 100644
--- a/src/main/java/ai/elimu/web/admin/application/ApplicationEditController.java
+++ b/src/main/java/ai/elimu/web/admin/application/ApplicationEditController.java
@@ -37,7 +37,7 @@ public String handleRequest(
             @PathVariable Long id,
             Model model
     ) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         Application application = applicationDao.read(id);
         model.addAttribute("application", application);
@@ -60,7 +60,7 @@ public String handleSubmit(
             BindingResult result,
             Model model
     ) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         if (result.hasErrors()) {
             model.addAttribute("application", application);
diff --git a/src/main/java/ai/elimu/web/admin/application/ApplicationListController.java b/src/main/java/ai/elimu/web/admin/application/ApplicationListController.java
index 29d7886a7..cd1d8bade 100644
--- a/src/main/java/ai/elimu/web/admin/application/ApplicationListController.java
+++ b/src/main/java/ai/elimu/web/admin/application/ApplicationListController.java
@@ -28,7 +28,7 @@ public class ApplicationListController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         
         // List count of active Android applications for each EGRA/EGMA skill
diff --git a/src/main/java/ai/elimu/web/admin/application_version/ApplicationVersionCreateController.java b/src/main/java/ai/elimu/web/admin/application_version/ApplicationVersionCreateController.java
index b36e629d1..aeee12179 100644
--- a/src/main/java/ai/elimu/web/admin/application_version/ApplicationVersionCreateController.java
+++ b/src/main/java/ai/elimu/web/admin/application_version/ApplicationVersionCreateController.java
@@ -48,7 +48,7 @@ public String handleRequest(
             @RequestParam Long applicationId,
             Model model
     ) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         logger.info("applicationId: " + applicationId);
         Application application = applicationDao.read(applicationId);
@@ -68,7 +68,7 @@ public String handleSubmit(
             Model model,
             HttpSession session
     ) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         if (multipartFile.isEmpty()) {
             result.rejectValue("bytes", "NotNull");
@@ -179,7 +179,7 @@ public String handleSubmit(
      */
     @InitBinder
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws ServletException {
-    	logger.info("initBinder");
-    	binder.registerCustomEditor(byte[].class, new ByteArrayMultipartFileEditor());
+        logger.info("initBinder");
+        binder.registerCustomEditor(byte[].class, new ByteArrayMultipartFileEditor());
     }
 }
diff --git a/src/main/java/ai/elimu/web/analytics/LetterLearningEventListController.java b/src/main/java/ai/elimu/web/analytics/LetterLearningEventListController.java
index 7563c4fc4..f553e53b2 100644
--- a/src/main/java/ai/elimu/web/analytics/LetterLearningEventListController.java
+++ b/src/main/java/ai/elimu/web/analytics/LetterLearningEventListController.java
@@ -22,7 +22,7 @@ public class LetterLearningEventListController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         List<LetterLearningEvent> letterLearningEvents = letterLearningEventDao.readAll();
         model.addAttribute("letterLearningEvents", letterLearningEvents);
diff --git a/src/main/java/ai/elimu/web/analytics/MainAnalyticsController.java b/src/main/java/ai/elimu/web/analytics/MainAnalyticsController.java
index 6a99dfa7a..156d9546f 100644
--- a/src/main/java/ai/elimu/web/analytics/MainAnalyticsController.java
+++ b/src/main/java/ai/elimu/web/analytics/MainAnalyticsController.java
@@ -28,12 +28,12 @@ public class MainAnalyticsController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         model.addAttribute("letterLearningEventCount", letterLearningEventDao.readCount());
         model.addAttribute("wordLearningEventCount", wordLearningEventDao.readCount());
         model.addAttribute("storyBookLearningEventCount", storyBookLearningEventDao.readCount());
-    	
+        
         return "analytics/main";
     }
 }
diff --git a/src/main/java/ai/elimu/web/analytics/StoryBookLearningEventListController.java b/src/main/java/ai/elimu/web/analytics/StoryBookLearningEventListController.java
index 3cf61b660..95f9dfc5d 100644
--- a/src/main/java/ai/elimu/web/analytics/StoryBookLearningEventListController.java
+++ b/src/main/java/ai/elimu/web/analytics/StoryBookLearningEventListController.java
@@ -22,7 +22,7 @@ public class StoryBookLearningEventListController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         List<StoryBookLearningEvent> storyBookLearningEvents = storyBookLearningEventDao.readAllOrderedByTime();
         model.addAttribute("storyBookLearningEvents", storyBookLearningEvents);
diff --git a/src/main/java/ai/elimu/web/analytics/WordLearningEventListController.java b/src/main/java/ai/elimu/web/analytics/WordLearningEventListController.java
index 38dbceff1..7fb5ba1c2 100644
--- a/src/main/java/ai/elimu/web/analytics/WordLearningEventListController.java
+++ b/src/main/java/ai/elimu/web/analytics/WordLearningEventListController.java
@@ -22,7 +22,7 @@ public class WordLearningEventListController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         List<WordLearningEvent> wordLearningEvents = wordLearningEventDao.readAll();
         model.addAttribute("wordLearningEvents", wordLearningEvents);
diff --git a/src/main/java/ai/elimu/web/content/MainContentController.java b/src/main/java/ai/elimu/web/content/MainContentController.java
index 8147a8de1..b11377e63 100644
--- a/src/main/java/ai/elimu/web/content/MainContentController.java
+++ b/src/main/java/ai/elimu/web/content/MainContentController.java
@@ -97,7 +97,7 @@ public String handleRequest(
             HttpSession session, 
             Principal principal, 
             Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         // Check if the Contributor has not yet provided all required details
         Contributor contributor = (Contributor) session.getAttribute("contributor");
@@ -164,7 +164,7 @@ public String handleRequest(
             numberContributionsCountMap.put(contributorWithContributions.getId(), numberContributionEventDao.readCount(contributorWithContributions));
         }
         model.addAttribute("numberContributionsCountMap", numberContributionsCountMap);
-    	
+        
         return "content/main";
     }
 }
diff --git a/src/main/java/ai/elimu/web/content/contributor/AddEmailController.java b/src/main/java/ai/elimu/web/content/contributor/AddEmailController.java
index 92cf3b48f..17e978809 100644
--- a/src/main/java/ai/elimu/web/content/contributor/AddEmailController.java
+++ b/src/main/java/ai/elimu/web/content/contributor/AddEmailController.java
@@ -28,8 +28,8 @@ public class AddEmailController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest() {
-    	logger.info("handleRequest");
-    	
+        logger.info("handleRequest");
+        
         return "content/contributor/add-email";
     }
     
@@ -38,7 +38,7 @@ public String handleSubmit(
             HttpSession session,
             @RequestParam String email,
             Model model) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         if (!EmailValidator.getInstance().isValid(email)) {
             // TODO: display error message
@@ -57,7 +57,7 @@ public String handleSubmit(
         contributorDao.create(contributor);
         
         session.setAttribute("contributor", contributor);
-    	
+        
         return "redirect:/content";
     }
 }
diff --git a/src/main/java/ai/elimu/web/content/contributor/ContributorController.java b/src/main/java/ai/elimu/web/content/contributor/ContributorController.java
index 3fbddcafd..ebe4e296a 100644
--- a/src/main/java/ai/elimu/web/content/contributor/ContributorController.java
+++ b/src/main/java/ai/elimu/web/content/contributor/ContributorController.java
@@ -66,7 +66,7 @@ public String handleRequest(
             @PathVariable Long contributorId,
             Model model
     ) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         Contributor contributor = contributorDao.read(contributorId);
         model.addAttribute("contributor2", contributor);
diff --git a/src/main/java/ai/elimu/web/content/contributor/ContributorListController.java b/src/main/java/ai/elimu/web/content/contributor/ContributorListController.java
index 9d7e49ea3..b058f0b39 100644
--- a/src/main/java/ai/elimu/web/content/contributor/ContributorListController.java
+++ b/src/main/java/ai/elimu/web/content/contributor/ContributorListController.java
@@ -20,7 +20,7 @@ public class ContributorListController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         model.addAttribute("contributors", contributorDao.readAllOrderedDesc());
 
diff --git a/src/main/java/ai/elimu/web/content/contributor/EditMotivationController.java b/src/main/java/ai/elimu/web/content/contributor/EditMotivationController.java
index 02ec74ff1..c476813b0 100644
--- a/src/main/java/ai/elimu/web/content/contributor/EditMotivationController.java
+++ b/src/main/java/ai/elimu/web/content/contributor/EditMotivationController.java
@@ -28,7 +28,7 @@ public class EditMotivationController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest() {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
 
         return "content/contributor/edit-motivation";
     }
@@ -38,7 +38,7 @@ public String handleSubmit(
             HttpSession session,
             @RequestParam String motivation,
             Model model) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         logger.info("motivation: " + motivation);
         
diff --git a/src/main/java/ai/elimu/web/content/contributor/EditNameController.java b/src/main/java/ai/elimu/web/content/contributor/EditNameController.java
index 5de368b86..cd25dd918 100644
--- a/src/main/java/ai/elimu/web/content/contributor/EditNameController.java
+++ b/src/main/java/ai/elimu/web/content/contributor/EditNameController.java
@@ -24,7 +24,7 @@ public class EditNameController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest() {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
 
         return "content/contributor/edit-name";
     }
@@ -35,7 +35,7 @@ public String handleSubmit(
             @RequestParam String firstName,
             @RequestParam String lastName,
             Model model) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         logger.info("firstName: " + firstName);
         logger.info("lastName: " + lastName);
@@ -46,7 +46,7 @@ public String handleSubmit(
         contributor.setLastName(lastName);
         contributorDao.update(contributor);
         session.setAttribute("contributor", contributor);
-    	
+        
         return "redirect:/content";
     }
 }
diff --git a/src/main/java/ai/elimu/web/content/emoji/EmojiCreateController.java b/src/main/java/ai/elimu/web/content/emoji/EmojiCreateController.java
index eb84e84a7..ea51d3c5d 100644
--- a/src/main/java/ai/elimu/web/content/emoji/EmojiCreateController.java
+++ b/src/main/java/ai/elimu/web/content/emoji/EmojiCreateController.java
@@ -25,7 +25,7 @@ public class EmojiCreateController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         Emoji emoji = new Emoji();
         model.addAttribute("emoji", emoji);
@@ -38,7 +38,7 @@ public String handleSubmit(
             @Valid Emoji emoji,
             BindingResult result,
             Model model) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         Emoji existingEmoji = emojiDao.readByGlyph(emoji.getGlyph());
         if (existingEmoji != null) {
diff --git a/src/main/java/ai/elimu/web/content/emoji/EmojiEditController.java b/src/main/java/ai/elimu/web/content/emoji/EmojiEditController.java
index a7e218ff2..f76053313 100644
--- a/src/main/java/ai/elimu/web/content/emoji/EmojiEditController.java
+++ b/src/main/java/ai/elimu/web/content/emoji/EmojiEditController.java
@@ -41,7 +41,7 @@ public class EmojiEditController {
     public String handleRequest(
             Model model, 
             @PathVariable Long id) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         Emoji emoji = emojiDao.read(id);
         model.addAttribute("emoji", emoji);
@@ -58,7 +58,7 @@ public String handleSubmit(
             @Valid Emoji emoji,
             BindingResult result,
             Model model) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         Emoji existingEmoji = emojiDao.readByGlyph(emoji.getGlyph());
         if ((existingEmoji != null) && !existingEmoji.getId().equals(emoji.getId())) {
@@ -91,7 +91,7 @@ public String handleSubmit(
     public String handleAddContentLabelRequest(
             HttpServletRequest request,
             @PathVariable Long id) {
-    	logger.info("handleAddContentLabelRequest");
+        logger.info("handleAddContentLabelRequest");
         
         logger.info("id: " + id);
         Emoji emoji = emojiDao.read(id);
@@ -117,7 +117,7 @@ public String handleAddContentLabelRequest(
     public String handleRemoveContentLabelRequest(
             HttpServletRequest request,
             @PathVariable Long id) {
-    	logger.info("handleRemoveContentLabelRequest");
+        logger.info("handleRemoveContentLabelRequest");
         
         logger.info("id: " + id);
         Emoji emoji = emojiDao.read(id);
diff --git a/src/main/java/ai/elimu/web/content/emoji/EmojiListController.java b/src/main/java/ai/elimu/web/content/emoji/EmojiListController.java
index 01ebc55e8..140c1f3c7 100644
--- a/src/main/java/ai/elimu/web/content/emoji/EmojiListController.java
+++ b/src/main/java/ai/elimu/web/content/emoji/EmojiListController.java
@@ -22,7 +22,7 @@ public class EmojiListController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         List<Emoji> emojis = emojiDao.readAllOrdered();
         model.addAttribute("emojis", emojis);
diff --git a/src/main/java/ai/elimu/web/content/letter/LetterCreateController.java b/src/main/java/ai/elimu/web/content/letter/LetterCreateController.java
index b114456e0..3b09bccbc 100644
--- a/src/main/java/ai/elimu/web/content/letter/LetterCreateController.java
+++ b/src/main/java/ai/elimu/web/content/letter/LetterCreateController.java
@@ -37,7 +37,7 @@ public class LetterCreateController {
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(
             Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         Letter letter = new Letter();
         model.addAttribute("letter", letter);
@@ -53,7 +53,7 @@ public String handleSubmit(
             @Valid Letter letter,
             BindingResult result,
             Model model) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         Letter existingLetter = letterDao.readByText(letter.getText());
         if (existingLetter != null) {
diff --git a/src/main/java/ai/elimu/web/content/letter/LetterEditController.java b/src/main/java/ai/elimu/web/content/letter/LetterEditController.java
index c64a2b538..17d10df32 100644
--- a/src/main/java/ai/elimu/web/content/letter/LetterEditController.java
+++ b/src/main/java/ai/elimu/web/content/letter/LetterEditController.java
@@ -45,7 +45,7 @@ public class LetterEditController {
     public String handleRequest(
             Model model, 
             @PathVariable Long id) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         Letter letter = letterDao.read(id);
         model.addAttribute("letter", letter);
@@ -65,7 +65,7 @@ public String handleSubmit(
             @Valid Letter letter,
             BindingResult result,
             Model model) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         Letter existingLetter = letterDao.readByText(letter.getText());
         if ((existingLetter != null) && !existingLetter.getId().equals(letter.getId())) {
diff --git a/src/main/java/ai/elimu/web/content/letter/LetterListController.java b/src/main/java/ai/elimu/web/content/letter/LetterListController.java
index 53f4837e5..3dcf0c871 100644
--- a/src/main/java/ai/elimu/web/content/letter/LetterListController.java
+++ b/src/main/java/ai/elimu/web/content/letter/LetterListController.java
@@ -22,7 +22,7 @@ public class LetterListController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         List<Letter> letters = letterDao.readAllOrderedByUsage();
         model.addAttribute("letters", letters);
diff --git a/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundCreateController.java b/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundCreateController.java
index 8688041c1..e720e49e0 100644
--- a/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundCreateController.java
+++ b/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundCreateController.java
@@ -48,7 +48,7 @@ public class LetterSoundCreateController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
 
         LetterSound letterSound = new LetterSound();
         model.addAttribute("letterSound", letterSound);
@@ -72,7 +72,7 @@ public String handleSubmit(
             BindingResult result,
             Model model
     ) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         // Check if the LetterSound already exists
         LetterSound existingLetterSound = letterSoundDao.read(letterSound.getLetters(), letterSound.getSounds());
diff --git a/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundEditController.java b/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundEditController.java
index 4ddca0da8..1227866d5 100644
--- a/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundEditController.java
+++ b/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundEditController.java
@@ -58,7 +58,7 @@ public class LetterSoundEditController {
 
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     public String handleRequest(Model model, @PathVariable Long id) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
 
         LetterSound letterSound = letterSoundDao.read(id);
         model.addAttribute("letterSound", letterSound);
@@ -88,7 +88,7 @@ public String handleSubmit(
             BindingResult result,
             Model model
     ) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         // Check if the LetterSound already exists
         LetterSound existingLetterSound = letterSoundDao.read(letterSound.getLetters(), letterSound.getSounds());
diff --git a/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundListController.java b/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundListController.java
index 632dc4089..632f77374 100644
--- a/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundListController.java
+++ b/src/main/java/ai/elimu/web/content/letter_sound/LetterSoundListController.java
@@ -22,7 +22,7 @@ public class LetterSoundListController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         List<LetterSound> letterSounds = letterSoundDao.readAllOrderedByUsage();
         model.addAttribute("letterSounds", letterSounds);
diff --git a/src/main/java/ai/elimu/web/content/multimedia/audio/AudioCreateController.java b/src/main/java/ai/elimu/web/content/multimedia/audio/AudioCreateController.java
index 20e264bd8..93de39776 100644
--- a/src/main/java/ai/elimu/web/content/multimedia/audio/AudioCreateController.java
+++ b/src/main/java/ai/elimu/web/content/multimedia/audio/AudioCreateController.java
@@ -72,7 +72,7 @@ public String handleRequest(
             @RequestParam(required = false) String autoFillTitle,
             @RequestParam(required = false) String autoFillTranscription
     ) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         Audio audio = new Audio();
         
@@ -123,7 +123,7 @@ public String handleSubmit(
             @RequestParam("bytes") MultipartFile multipartFile,
             BindingResult result,
             Model model) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         try {
             byte[] bytes = multipartFile.getBytes();
@@ -218,8 +218,8 @@ public String handleSubmit(
      */
     @InitBinder
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws ServletException {
-    	logger.info("initBinder");
-    	binder.registerCustomEditor(byte[].class, new ByteArrayMultipartFileEditor());
+        logger.info("initBinder");
+        binder.registerCustomEditor(byte[].class, new ByteArrayMultipartFileEditor());
     }
     
     private Map<Long, String> getEmojisByWordId() {
diff --git a/src/main/java/ai/elimu/web/content/multimedia/audio/AudioEditController.java b/src/main/java/ai/elimu/web/content/multimedia/audio/AudioEditController.java
index 2e58490dc..cc8888f45 100644
--- a/src/main/java/ai/elimu/web/content/multimedia/audio/AudioEditController.java
+++ b/src/main/java/ai/elimu/web/content/multimedia/audio/AudioEditController.java
@@ -85,7 +85,7 @@ public class AudioEditController {
     public String handleRequest(
             Model model, 
             @PathVariable Long id) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         Audio audio = audioDao.read(id);
         model.addAttribute("audio", audio);
@@ -115,7 +115,7 @@ public String handleSubmit(
             @RequestParam("bytes") MultipartFile multipartFile,
             BindingResult result,
             Model model) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         try {
             byte[] bytes = multipartFile.getBytes();
@@ -215,8 +215,8 @@ public String handleSubmit(
      */
     @InitBinder
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws ServletException {
-    	logger.info("initBinder");
-    	binder.registerCustomEditor(byte[].class, new ByteArrayMultipartFileEditor());
+        logger.info("initBinder");
+        binder.registerCustomEditor(byte[].class, new ByteArrayMultipartFileEditor());
     }
     
     @RequestMapping(value = "/{id}/add-content-label", method = RequestMethod.POST)
@@ -224,7 +224,7 @@ protected void initBinder(HttpServletRequest request, ServletRequestDataBinder b
     public String handleAddContentLabelRequest(
             HttpServletRequest request,
             @PathVariable Long id) {
-    	logger.info("handleAddContentLabelRequest");
+        logger.info("handleAddContentLabelRequest");
         
         logger.info("id: " + id);
         Audio audio = audioDao.read(id);
@@ -276,7 +276,7 @@ public String handleAddContentLabelRequest(
     public String handleRemoveContentLabelRequest(
             HttpServletRequest request,
             @PathVariable Long id) {
-    	logger.info("handleRemoveContentLabelRequest");
+        logger.info("handleRemoveContentLabelRequest");
         
         logger.info("id: " + id);
         Audio audio = audioDao.read(id);
diff --git a/src/main/java/ai/elimu/web/content/multimedia/audio/AudioListController.java b/src/main/java/ai/elimu/web/content/multimedia/audio/AudioListController.java
index 7520dc036..dd4db67ad 100644
--- a/src/main/java/ai/elimu/web/content/multimedia/audio/AudioListController.java
+++ b/src/main/java/ai/elimu/web/content/multimedia/audio/AudioListController.java
@@ -23,7 +23,7 @@ public class AudioListController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         List<Audio> audios = audioDao.readAllOrderedByTimeLastUpdate();
         model.addAttribute("audios", audios);
diff --git a/src/main/java/ai/elimu/web/content/multimedia/image/ImageCreateController.java b/src/main/java/ai/elimu/web/content/multimedia/image/ImageCreateController.java
index 95d68a940..b1a1f593f 100644
--- a/src/main/java/ai/elimu/web/content/multimedia/image/ImageCreateController.java
+++ b/src/main/java/ai/elimu/web/content/multimedia/image/ImageCreateController.java
@@ -56,7 +56,7 @@ public class ImageCreateController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         Image image = new Image();
         model.addAttribute("image", image);
@@ -76,7 +76,7 @@ public String handleSubmit(
             @RequestParam("bytes") MultipartFile multipartFile,
             BindingResult result,
             Model model) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         if (StringUtils.isBlank(image.getTitle())) {
             result.rejectValue("title", "NotNull");
@@ -198,7 +198,7 @@ public String handleSubmit(
      */
     @InitBinder
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws ServletException {
-    	logger.info("initBinder");
-    	binder.registerCustomEditor(byte[].class, new ByteArrayMultipartFileEditor());
+        logger.info("initBinder");
+        binder.registerCustomEditor(byte[].class, new ByteArrayMultipartFileEditor());
     }
 }
diff --git a/src/main/java/ai/elimu/web/content/multimedia/image/ImageDeleteController.java b/src/main/java/ai/elimu/web/content/multimedia/image/ImageDeleteController.java
index d486504c5..1064d13f7 100644
--- a/src/main/java/ai/elimu/web/content/multimedia/image/ImageDeleteController.java
+++ b/src/main/java/ai/elimu/web/content/multimedia/image/ImageDeleteController.java
@@ -21,7 +21,7 @@ public class ImageDeleteController {
 
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     public String handleRequest(Model model, @PathVariable Long id) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         // Before deleting, check if the image is used in any StoryBooks
         // TODO
diff --git a/src/main/java/ai/elimu/web/content/multimedia/image/ImageEditController.java b/src/main/java/ai/elimu/web/content/multimedia/image/ImageEditController.java
index a48592383..5072477a0 100644
--- a/src/main/java/ai/elimu/web/content/multimedia/image/ImageEditController.java
+++ b/src/main/java/ai/elimu/web/content/multimedia/image/ImageEditController.java
@@ -82,7 +82,7 @@ public class ImageEditController {
     public String handleRequest(
             Model model, 
             @PathVariable Long id) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         Image image = imageDao.read(id);
         model.addAttribute("image", image);
@@ -112,7 +112,7 @@ public String handleSubmit(
             @RequestParam("bytes") MultipartFile multipartFile,
             BindingResult result,
             Model model) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         if (StringUtils.isBlank(image.getTitle())) {
             result.rejectValue("title", "NotNull");
@@ -230,8 +230,8 @@ public String handleSubmit(
      */
     @InitBinder
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws ServletException {
-    	logger.info("initBinder");
-    	binder.registerCustomEditor(byte[].class, new ByteArrayMultipartFileEditor());
+        logger.info("initBinder");
+        binder.registerCustomEditor(byte[].class, new ByteArrayMultipartFileEditor());
     }
     
     @RequestMapping(value = "/{id}/add-content-label", method = RequestMethod.POST)
@@ -239,7 +239,7 @@ protected void initBinder(HttpServletRequest request, ServletRequestDataBinder b
     public String handleAddContentLabelRequest(
             HttpServletRequest request,
             @PathVariable Long id) {
-    	logger.info("handleAddContentLabelRequest");
+        logger.info("handleAddContentLabelRequest");
         
         logger.info("id: " + id);
         Image image = imageDao.read(id);
@@ -291,7 +291,7 @@ public String handleAddContentLabelRequest(
     public String handleRemoveContentLabelRequest(
             HttpServletRequest request,
             @PathVariable Long id) {
-    	logger.info("handleRemoveContentLabelRequest");
+        logger.info("handleRemoveContentLabelRequest");
         
         logger.info("id: " + id);
         Image image = imageDao.read(id);
diff --git a/src/main/java/ai/elimu/web/content/multimedia/image/ImageListController.java b/src/main/java/ai/elimu/web/content/multimedia/image/ImageListController.java
index 541474fd8..01dcd9d0e 100644
--- a/src/main/java/ai/elimu/web/content/multimedia/image/ImageListController.java
+++ b/src/main/java/ai/elimu/web/content/multimedia/image/ImageListController.java
@@ -36,7 +36,7 @@ public class ImageListController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         List<Image> images = imageDao.readAllOrdered();
         model.addAttribute("images", images);
diff --git a/src/main/java/ai/elimu/web/content/multimedia/video/VideoCreateController.java b/src/main/java/ai/elimu/web/content/multimedia/video/VideoCreateController.java
index c843b6e42..e7f8b89e6 100644
--- a/src/main/java/ai/elimu/web/content/multimedia/video/VideoCreateController.java
+++ b/src/main/java/ai/elimu/web/content/multimedia/video/VideoCreateController.java
@@ -38,7 +38,7 @@ public class VideoCreateController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         Video video = new Video();
         model.addAttribute("video", video);
@@ -58,7 +58,7 @@ public String handleSubmit(
             @RequestParam("thumbnail") MultipartFile multipartFileThumbnail,
             BindingResult result,
             Model model) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         if (StringUtils.isBlank(video.getTitle())) {
             result.rejectValue("title", "NotNull");
@@ -148,7 +148,7 @@ public String handleSubmit(
      */
     @InitBinder
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws ServletException {
-    	logger.info("initBinder");
-    	binder.registerCustomEditor(byte[].class, new ByteArrayMultipartFileEditor());
+        logger.info("initBinder");
+        binder.registerCustomEditor(byte[].class, new ByteArrayMultipartFileEditor());
     }
 }
diff --git a/src/main/java/ai/elimu/web/content/multimedia/video/VideoEditController.java b/src/main/java/ai/elimu/web/content/multimedia/video/VideoEditController.java
index c4d9af53c..1f61c5ce9 100644
--- a/src/main/java/ai/elimu/web/content/multimedia/video/VideoEditController.java
+++ b/src/main/java/ai/elimu/web/content/multimedia/video/VideoEditController.java
@@ -66,7 +66,7 @@ public class VideoEditController {
     public String handleRequest(
             Model model, 
             @PathVariable Long id) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         Video video = videoDao.read(id);
         model.addAttribute("video", video);
@@ -90,7 +90,7 @@ public String handleSubmit(
             @RequestParam("bytes") MultipartFile multipartFile,
             BindingResult result,
             Model model) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         if (StringUtils.isBlank(video.getTitle())) {
             result.rejectValue("title", "NotNull");
@@ -158,8 +158,8 @@ public String handleSubmit(
      */
     @InitBinder
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws ServletException {
-    	logger.info("initBinder");
-    	binder.registerCustomEditor(byte[].class, new ByteArrayMultipartFileEditor());
+        logger.info("initBinder");
+        binder.registerCustomEditor(byte[].class, new ByteArrayMultipartFileEditor());
     }
     
     @RequestMapping(value = "/{id}/add-content-label", method = RequestMethod.POST)
@@ -167,7 +167,7 @@ protected void initBinder(HttpServletRequest request, ServletRequestDataBinder b
     public String handleAddContentLabelRequest(
             HttpServletRequest request,
             @PathVariable Long id) {
-    	logger.info("handleAddContentLabelRequest");
+        logger.info("handleAddContentLabelRequest");
         
         logger.info("id: " + id);
         Video video = videoDao.read(id);
@@ -219,7 +219,7 @@ public String handleAddContentLabelRequest(
     public String handleRemoveContentLabelRequest(
             HttpServletRequest request,
             @PathVariable Long id) {
-    	logger.info("handleRemoveContentLabelRequest");
+        logger.info("handleRemoveContentLabelRequest");
         
         logger.info("id: " + id);
         Video video = videoDao.read(id);
diff --git a/src/main/java/ai/elimu/web/content/multimedia/video/VideoListController.java b/src/main/java/ai/elimu/web/content/multimedia/video/VideoListController.java
index 0f77bdd41..149b7bc83 100644
--- a/src/main/java/ai/elimu/web/content/multimedia/video/VideoListController.java
+++ b/src/main/java/ai/elimu/web/content/multimedia/video/VideoListController.java
@@ -23,7 +23,7 @@ public class VideoListController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         List<Video> videos = videoDao.readAllOrdered();
         model.addAttribute("videos", videos);
diff --git a/src/main/java/ai/elimu/web/content/number/NumberCreateController.java b/src/main/java/ai/elimu/web/content/number/NumberCreateController.java
index 772060d0a..9801ec292 100644
--- a/src/main/java/ai/elimu/web/content/number/NumberCreateController.java
+++ b/src/main/java/ai/elimu/web/content/number/NumberCreateController.java
@@ -50,7 +50,7 @@ public class NumberCreateController {
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(
             Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         Number number = new Number();
         model.addAttribute("number", number);
@@ -70,7 +70,7 @@ public String handleSubmit(
             @Valid Number number,
             BindingResult result,
             Model model) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         Number existingNumber = numberDao.readByValue(number.getValue());
         if (existingNumber != null) {
diff --git a/src/main/java/ai/elimu/web/content/number/NumberDeleteController.java b/src/main/java/ai/elimu/web/content/number/NumberDeleteController.java
index ad85fa462..0d5e350d2 100644
--- a/src/main/java/ai/elimu/web/content/number/NumberDeleteController.java
+++ b/src/main/java/ai/elimu/web/content/number/NumberDeleteController.java
@@ -21,7 +21,7 @@ public class NumberDeleteController {
 
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     public String handleRequest(Model model, @PathVariable Long id) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
 //        Number number = numberDao.read(id);
 //        numberDao.delete(number);
diff --git a/src/main/java/ai/elimu/web/content/number/NumberEditController.java b/src/main/java/ai/elimu/web/content/number/NumberEditController.java
index 2f69a219d..9efb6fe11 100644
--- a/src/main/java/ai/elimu/web/content/number/NumberEditController.java
+++ b/src/main/java/ai/elimu/web/content/number/NumberEditController.java
@@ -56,7 +56,7 @@ public class NumberEditController {
     public String handleRequest(
             Model model, 
             @PathVariable Long id) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         Number number = numberDao.read(id);
         model.addAttribute("number", number);
@@ -79,7 +79,7 @@ public String handleSubmit(
             @Valid Number number,
             BindingResult result,
             Model model) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         Number existingNumber = numberDao.readByValue(number.getValue());
         if ((existingNumber != null) && !existingNumber.getId().equals(number.getId())) {
diff --git a/src/main/java/ai/elimu/web/content/number/NumberListController.java b/src/main/java/ai/elimu/web/content/number/NumberListController.java
index 0a554dd0c..42a5d60f7 100644
--- a/src/main/java/ai/elimu/web/content/number/NumberListController.java
+++ b/src/main/java/ai/elimu/web/content/number/NumberListController.java
@@ -22,7 +22,7 @@ public class NumberListController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         List<Number> numbers = numberDao.readAllOrdered();
         model.addAttribute("numbers", numbers);
diff --git a/src/main/java/ai/elimu/web/content/peer_review/AudioPeerReviewEventCreateController.java b/src/main/java/ai/elimu/web/content/peer_review/AudioPeerReviewEventCreateController.java
index 1126afaca..d99d0e33d 100644
--- a/src/main/java/ai/elimu/web/content/peer_review/AudioPeerReviewEventCreateController.java
+++ b/src/main/java/ai/elimu/web/content/peer_review/AudioPeerReviewEventCreateController.java
@@ -46,7 +46,7 @@ public String handleSubmit(
             @RequestParam(required = false) String comment,
             HttpSession session
     ) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         Contributor contributor = (Contributor) session.getAttribute("contributor");
         
diff --git a/src/main/java/ai/elimu/web/content/peer_review/LetterSoundPeerReviewEventCreateController.java b/src/main/java/ai/elimu/web/content/peer_review/LetterSoundPeerReviewEventCreateController.java
index b39eddbf9..96c14c690 100644
--- a/src/main/java/ai/elimu/web/content/peer_review/LetterSoundPeerReviewEventCreateController.java
+++ b/src/main/java/ai/elimu/web/content/peer_review/LetterSoundPeerReviewEventCreateController.java
@@ -45,7 +45,7 @@ public String handleSubmit(
             @RequestParam(required = false) String comment,
             HttpSession session
     ) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         Contributor contributor = (Contributor) session.getAttribute("contributor");
         
diff --git a/src/main/java/ai/elimu/web/content/peer_review/NumberPeerReviewEventCreateController.java b/src/main/java/ai/elimu/web/content/peer_review/NumberPeerReviewEventCreateController.java
index 4f3a946db..883270c12 100644
--- a/src/main/java/ai/elimu/web/content/peer_review/NumberPeerReviewEventCreateController.java
+++ b/src/main/java/ai/elimu/web/content/peer_review/NumberPeerReviewEventCreateController.java
@@ -43,7 +43,7 @@ public String handleSubmit(
             @RequestParam(required = false) String comment,
             HttpSession session
     ) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         Contributor contributor = (Contributor) session.getAttribute("contributor");
         
diff --git a/src/main/java/ai/elimu/web/content/peer_review/StoryBookPeerReviewEventCreateController.java b/src/main/java/ai/elimu/web/content/peer_review/StoryBookPeerReviewEventCreateController.java
index b31903398..00651182e 100644
--- a/src/main/java/ai/elimu/web/content/peer_review/StoryBookPeerReviewEventCreateController.java
+++ b/src/main/java/ai/elimu/web/content/peer_review/StoryBookPeerReviewEventCreateController.java
@@ -43,7 +43,7 @@ public String handleSubmit(
             @RequestParam(required = false) String comment,
             HttpSession session
     ) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         Contributor contributor = (Contributor) session.getAttribute("contributor");
         
diff --git a/src/main/java/ai/elimu/web/content/peer_review/WordPeerReviewEventCreateController.java b/src/main/java/ai/elimu/web/content/peer_review/WordPeerReviewEventCreateController.java
index 556894fd1..95e4c8bae 100644
--- a/src/main/java/ai/elimu/web/content/peer_review/WordPeerReviewEventCreateController.java
+++ b/src/main/java/ai/elimu/web/content/peer_review/WordPeerReviewEventCreateController.java
@@ -43,7 +43,7 @@ public String handleSubmit(
             @RequestParam(required = false) String comment,
             HttpSession session
     ) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         Contributor contributor = (Contributor) session.getAttribute("contributor");
         
diff --git a/src/main/java/ai/elimu/web/content/sound/SoundCreateController.java b/src/main/java/ai/elimu/web/content/sound/SoundCreateController.java
index cf248f8e4..0d33cc082 100644
--- a/src/main/java/ai/elimu/web/content/sound/SoundCreateController.java
+++ b/src/main/java/ai/elimu/web/content/sound/SoundCreateController.java
@@ -37,7 +37,7 @@ public class SoundCreateController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         Sound sound = new Sound();
         model.addAttribute("sound", sound);
@@ -56,7 +56,7 @@ public String handleSubmit(
             BindingResult result,
             Model model
     ) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         if (StringUtils.isNotBlank(sound.getValueIpa())) {
             Sound existingSound = soundDao.readByValueIpa(sound.getValueIpa());
diff --git a/src/main/java/ai/elimu/web/content/sound/SoundEditController.java b/src/main/java/ai/elimu/web/content/sound/SoundEditController.java
index 6c9958123..dd6e20b82 100644
--- a/src/main/java/ai/elimu/web/content/sound/SoundEditController.java
+++ b/src/main/java/ai/elimu/web/content/sound/SoundEditController.java
@@ -42,7 +42,7 @@ public class SoundEditController {
     
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     public String handleRequest(Model model, @PathVariable Long id) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         Sound sound = soundDao.read(id);
         model.addAttribute("sound", sound);
@@ -66,7 +66,7 @@ public String handleSubmit(
             BindingResult result,
             Model model
     ) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         if (StringUtils.isNotBlank(sound.getValueIpa())) {
             Sound existingSound = soundDao.readByValueIpa(sound.getValueIpa());
diff --git a/src/main/java/ai/elimu/web/content/sound/SoundListController.java b/src/main/java/ai/elimu/web/content/sound/SoundListController.java
index 617e7a872..0403d5a3c 100644
--- a/src/main/java/ai/elimu/web/content/sound/SoundListController.java
+++ b/src/main/java/ai/elimu/web/content/sound/SoundListController.java
@@ -22,7 +22,7 @@ public class SoundListController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         List<Sound> sounds = soundDao.readAllOrderedByUsage();
         model.addAttribute("sounds", sounds);
diff --git a/src/main/java/ai/elimu/web/content/storybook/StoryBookCreateController.java b/src/main/java/ai/elimu/web/content/storybook/StoryBookCreateController.java
index fd3d756b1..32a1a3e74 100644
--- a/src/main/java/ai/elimu/web/content/storybook/StoryBookCreateController.java
+++ b/src/main/java/ai/elimu/web/content/storybook/StoryBookCreateController.java
@@ -44,7 +44,7 @@ public class StoryBookCreateController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         StoryBook storyBook = new StoryBook();
         model.addAttribute("storyBook", storyBook);
@@ -68,7 +68,7 @@ public String handleSubmit(
             Model model,
             HttpServletRequest request,
             HttpSession session) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         StoryBook existingStoryBook = storybookDao.readByTitle(storyBook.getTitle());
         if (existingStoryBook != null) {
diff --git a/src/main/java/ai/elimu/web/content/storybook/StoryBookCreateFromEPubController.java b/src/main/java/ai/elimu/web/content/storybook/StoryBookCreateFromEPubController.java
index c2c4a35a5..4ddf230f1 100644
--- a/src/main/java/ai/elimu/web/content/storybook/StoryBookCreateFromEPubController.java
+++ b/src/main/java/ai/elimu/web/content/storybook/StoryBookCreateFromEPubController.java
@@ -89,7 +89,7 @@ public class StoryBookCreateFromEPubController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
 
         StoryBook storyBook = new StoryBook();
         model.addAttribute("storyBook", storyBook);
@@ -108,7 +108,7 @@ public String handleSubmit(
             HttpServletRequest request,
             HttpSession session
     ) throws IOException {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
 
         Image storyBookCoverImage = null;
 
@@ -454,8 +454,8 @@ public String handleSubmit(
      */
     @InitBinder
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws ServletException {
-    	logger.info("initBinder");
-    	binder.registerCustomEditor(byte[].class, new ByteArrayMultipartFileEditor());
+        logger.info("initBinder");
+        binder.registerCustomEditor(byte[].class, new ByteArrayMultipartFileEditor());
     }
 
     /**
diff --git a/src/main/java/ai/elimu/web/content/storybook/StoryBookEditController.java b/src/main/java/ai/elimu/web/content/storybook/StoryBookEditController.java
index e6581f213..b3e03c582 100644
--- a/src/main/java/ai/elimu/web/content/storybook/StoryBookEditController.java
+++ b/src/main/java/ai/elimu/web/content/storybook/StoryBookEditController.java
@@ -85,7 +85,7 @@ public class StoryBookEditController {
 
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     public String handleRequest(Model model, @PathVariable Long id) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         StoryBook storyBook = storyBookDao.read(id);
         model.addAttribute("storyBook", storyBook);
@@ -148,7 +148,7 @@ public String handleSubmit(
             Model model,
             HttpServletRequest request,
             HttpSession session) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         StoryBook existingStoryBook = storyBookDao.readByTitle(storyBook.getTitle());
         if ((existingStoryBook != null) && !existingStoryBook.getId().equals(storyBook.getId())) {
diff --git a/src/main/java/ai/elimu/web/content/storybook/StoryBookListController.java b/src/main/java/ai/elimu/web/content/storybook/StoryBookListController.java
index ce2a04640..e1f0ea380 100644
--- a/src/main/java/ai/elimu/web/content/storybook/StoryBookListController.java
+++ b/src/main/java/ai/elimu/web/content/storybook/StoryBookListController.java
@@ -21,7 +21,7 @@ public class StoryBookListController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         model.addAttribute("storyBooksLevel1", storyBookDao.readAllOrdered(ReadingLevel.LEVEL1));
         model.addAttribute("storyBooksLevel2", storyBookDao.readAllOrdered(ReadingLevel.LEVEL2));
diff --git a/src/main/java/ai/elimu/web/content/storybook/chapter/StoryBookChapterCreateController.java b/src/main/java/ai/elimu/web/content/storybook/chapter/StoryBookChapterCreateController.java
index 368428663..2790df151 100644
--- a/src/main/java/ai/elimu/web/content/storybook/chapter/StoryBookChapterCreateController.java
+++ b/src/main/java/ai/elimu/web/content/storybook/chapter/StoryBookChapterCreateController.java
@@ -49,7 +49,7 @@ public String handleRequest(
             @PathVariable Long storyBookId,
             Model model
     ) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         StoryBookChapter storyBookChapter = new StoryBookChapter();
         
@@ -75,7 +75,7 @@ public String handleSubmit(
             BindingResult result,
             Model model
     ) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         Contributor contributor = (Contributor) session.getAttribute("contributor");
         
diff --git a/src/main/java/ai/elimu/web/content/storybook/chapter/StoryBookChapterDeleteController.java b/src/main/java/ai/elimu/web/content/storybook/chapter/StoryBookChapterDeleteController.java
index 6cdc9143d..cde44ebec 100644
--- a/src/main/java/ai/elimu/web/content/storybook/chapter/StoryBookChapterDeleteController.java
+++ b/src/main/java/ai/elimu/web/content/storybook/chapter/StoryBookChapterDeleteController.java
@@ -63,7 +63,7 @@ public class StoryBookChapterDeleteController {
 
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     public String handleRequest(HttpSession session, @PathVariable Long storyBookId, @PathVariable Long id) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         Contributor contributor = (Contributor) session.getAttribute("contributor");
         logger.info("contributor.getRoles(): " + contributor.getRoles());
diff --git a/src/main/java/ai/elimu/web/content/storybook/paragraph/StoryBookParagraphCreateController.java b/src/main/java/ai/elimu/web/content/storybook/paragraph/StoryBookParagraphCreateController.java
index 9b4406b1d..08e3bda44 100644
--- a/src/main/java/ai/elimu/web/content/storybook/paragraph/StoryBookParagraphCreateController.java
+++ b/src/main/java/ai/elimu/web/content/storybook/paragraph/StoryBookParagraphCreateController.java
@@ -55,7 +55,7 @@ public class StoryBookParagraphCreateController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model, @PathVariable Long storyBookChapterId) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
          
         StoryBookParagraph storyBookParagraph = new StoryBookParagraph();
         
@@ -82,7 +82,7 @@ public String handleSubmit(
             BindingResult result,
             Model model
     ) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         Contributor contributor = (Contributor) session.getAttribute("contributor");
         
diff --git a/src/main/java/ai/elimu/web/content/storybook/paragraph/StoryBookParagraphDeleteController.java b/src/main/java/ai/elimu/web/content/storybook/paragraph/StoryBookParagraphDeleteController.java
index 1bac26f31..1d11a77f1 100644
--- a/src/main/java/ai/elimu/web/content/storybook/paragraph/StoryBookParagraphDeleteController.java
+++ b/src/main/java/ai/elimu/web/content/storybook/paragraph/StoryBookParagraphDeleteController.java
@@ -48,7 +48,7 @@ public class StoryBookParagraphDeleteController {
 
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     public String handleRequest(HttpSession session, @PathVariable Long id) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         Contributor contributor = (Contributor) session.getAttribute("contributor");
         logger.info("contributor.getRoles(): " + contributor.getRoles());
diff --git a/src/main/java/ai/elimu/web/content/storybook/paragraph/StoryBookParagraphEditController.java b/src/main/java/ai/elimu/web/content/storybook/paragraph/StoryBookParagraphEditController.java
index 596d40f27..d013651f7 100644
--- a/src/main/java/ai/elimu/web/content/storybook/paragraph/StoryBookParagraphEditController.java
+++ b/src/main/java/ai/elimu/web/content/storybook/paragraph/StoryBookParagraphEditController.java
@@ -46,7 +46,7 @@ public class StoryBookParagraphEditController {
 
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     public String handleRequest(Model model, @PathVariable Long id, HttpSession session) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         StoryBookParagraph storyBookParagraph = storyBookParagraphDao.read(id);
         logger.info("storyBookParagraph: " + storyBookParagraph);
@@ -65,7 +65,7 @@ public String handleSubmit(
             BindingResult result,
             Model model
     ) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         Contributor contributor = (Contributor) session.getAttribute("contributor");
         
diff --git a/src/main/java/ai/elimu/web/content/syllable/SyllableListController.java b/src/main/java/ai/elimu/web/content/syllable/SyllableListController.java
index 73fd6485e..3d3ae8bb1 100644
--- a/src/main/java/ai/elimu/web/content/syllable/SyllableListController.java
+++ b/src/main/java/ai/elimu/web/content/syllable/SyllableListController.java
@@ -22,7 +22,7 @@ public class SyllableListController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         List<Syllable> syllables = syllableDao.readAllOrderedByUsage();
         logger.info("syllables.size(): " + syllables.size());
diff --git a/src/main/java/ai/elimu/web/content/word/WordCreateController.java b/src/main/java/ai/elimu/web/content/word/WordCreateController.java
index 2a2430789..b89ac623d 100644
--- a/src/main/java/ai/elimu/web/content/word/WordCreateController.java
+++ b/src/main/java/ai/elimu/web/content/word/WordCreateController.java
@@ -66,7 +66,7 @@ public class WordCreateController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model, @RequestParam(required = false) String autoFillText) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         Word word = new Word();
         
@@ -96,7 +96,7 @@ public String handleSubmit(
             @Valid Word word,
             BindingResult result,
             Model model) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         Word existingWord = wordDao.readByTextAndType(word.getText(), word.getWordType());
         if (existingWord != null) {
diff --git a/src/main/java/ai/elimu/web/content/word/WordCreationsPendingController.java b/src/main/java/ai/elimu/web/content/word/WordCreationsPendingController.java
index da8f5fef8..febdc8890 100644
--- a/src/main/java/ai/elimu/web/content/word/WordCreationsPendingController.java
+++ b/src/main/java/ai/elimu/web/content/word/WordCreationsPendingController.java
@@ -33,7 +33,7 @@ public class WordCreationsPendingController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         List<String> paragraphs = new ArrayList<>();
         for (StoryBookParagraph storyBookParagraph : storyBookParagraphDao.readAll()) {
diff --git a/src/main/java/ai/elimu/web/content/word/WordEditController.java b/src/main/java/ai/elimu/web/content/word/WordEditController.java
index b82e594b2..21e3d9064 100644
--- a/src/main/java/ai/elimu/web/content/word/WordEditController.java
+++ b/src/main/java/ai/elimu/web/content/word/WordEditController.java
@@ -83,7 +83,7 @@ public String handleRequest(
             Model model,
             @PathVariable Long id
     ) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         Word word = wordDao.read(id);
         
@@ -132,7 +132,7 @@ public String handleSubmit(
             BindingResult result,
             Model model
     ) {
-    	logger.info("handleSubmit");
+        logger.info("handleSubmit");
         
         Word existingWord = wordDao.readByTextAndType(word.getText(), word.getWordType());
         if ((existingWord != null) && !existingWord.getId().equals(word.getId())) {
diff --git a/src/main/java/ai/elimu/web/content/word/WordListController.java b/src/main/java/ai/elimu/web/content/word/WordListController.java
index 9c84e5251..4b08da257 100644
--- a/src/main/java/ai/elimu/web/content/word/WordListController.java
+++ b/src/main/java/ai/elimu/web/content/word/WordListController.java
@@ -30,7 +30,7 @@ public class WordListController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         List<Word> words = wordDao.readAllOrderedByUsage();
         model.addAttribute("words", words);
diff --git a/src/main/java/ai/elimu/web/context/EnvironmentContextLoaderListener.java b/src/main/java/ai/elimu/web/context/EnvironmentContextLoaderListener.java
index fe3363d32..781b5fef0 100644
--- a/src/main/java/ai/elimu/web/context/EnvironmentContextLoaderListener.java
+++ b/src/main/java/ai/elimu/web/context/EnvironmentContextLoaderListener.java
@@ -18,6 +18,8 @@
 
 import ai.elimu.model.v2.enums.Environment;
 import ai.elimu.model.v2.enums.Language;
+import ai.elimu.util.ConfigHelper;
+
 import java.net.URL;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.config.Configurator;
@@ -28,9 +30,9 @@
  * to access this listener anywhere in the web application, outside of the framework.
  */
 public class EnvironmentContextLoaderListener extends ContextLoaderListener {
-	
+    
     public static Environment env = Environment.DEV;
-	
+    
     public final static Properties PROPERTIES = new Properties();
 
     private Logger logger = LogManager.getLogger();
@@ -42,8 +44,8 @@ public class EnvironmentContextLoaderListener extends ContextLoaderListener {
      */
     @Override
     public void contextInitialized(ServletContextEvent event) {
-    	logger.info("contextInitialized");
-    	
+        logger.info("contextInitialized");
+        
         ServletContext servletContext = event.getServletContext();
         
         // Fetch attribute set in the corresponding context file at $JETTY_HOME/webapps/
@@ -72,8 +74,8 @@ public void contextInitialized(ServletContextEvent event) {
 
     @Override
     protected void customizeContext(ServletContext servletContext, ConfigurableWebApplicationContext applicationContext) {
-    	logger.info("customizeContext");
-    	
+        logger.info("customizeContext");
+        
         // Load default settings
         try {
             Resource resourceConfig = new ServletContextResourceLoader(servletContext).getResource("classpath:config.properties");
@@ -91,7 +93,7 @@ protected void customizeContext(ServletContext servletContext, ConfigurableWebAp
             InputStream inputStream = null;
             try {
                 // Override config.properties
-            	Resource resourceConfig = new ServletContextResourceLoader(servletContext).getResource("classpath:config_" + env + ".properties");
+                Resource resourceConfig = new ServletContextResourceLoader(servletContext).getResource("classpath:config_" + env + ".properties");
                 PROPERTIES.load(resourceConfig.getInputStream());
 
                 // Override jdbc.properties
@@ -145,6 +147,11 @@ protected void customizeContext(ServletContext servletContext, ConfigurableWebAp
         // Add all supported languages
         PROPERTIES.put("supported.languages", Language.values());
 
+        // Add the POM version
+        String pomVersion = ConfigHelper.getProperty("pom.version");
+        logger.info("pomVersion: " + pomVersion);
+        PROPERTIES.put("pom.version", pomVersion);
+
         // Add config properties to application scope
         servletContext.setAttribute("configProperties", PROPERTIES);
         
diff --git a/src/main/java/ai/elimu/web/contributions/MostRecentContributionsController.java b/src/main/java/ai/elimu/web/contributions/MostRecentContributionsController.java
index c045fa833..6bff7821f 100644
--- a/src/main/java/ai/elimu/web/contributions/MostRecentContributionsController.java
+++ b/src/main/java/ai/elimu/web/contributions/MostRecentContributionsController.java
@@ -44,7 +44,7 @@ public class MostRecentContributionsController {
 
     @RequestMapping(method = RequestMethod.GET)
     public String handleRequest(Model model) {
-    	logger.info("handleRequest");
+        logger.info("handleRequest");
         
         List<StoryBookContributionEvent> storyBookContributionEvents = storyBookContributionEventDao.readMostRecent(9);
         logger.info("storyBookContributionEvents.size(): " + storyBookContributionEvents.size());
diff --git a/src/main/java/ai/elimu/web/servlet/CustomDispatcherServlet.java b/src/main/java/ai/elimu/web/servlet/CustomDispatcherServlet.java
index 74a287c5b..cf5386908 100644
--- a/src/main/java/ai/elimu/web/servlet/CustomDispatcherServlet.java
+++ b/src/main/java/ai/elimu/web/servlet/CustomDispatcherServlet.java
@@ -32,8 +32,8 @@ public class CustomDispatcherServlet extends DispatcherServlet {
 
     @Override
     protected WebApplicationContext initWebApplicationContext() {
-    	logger.info("initWebApplicationContext");
-    	
+        logger.info("initWebApplicationContext");
+        
         WebApplicationContext webApplicationContext = super.initWebApplicationContext();
 
         // Database migration
diff --git a/src/main/webapp/WEB-INF/dispatcher-servlet.xml b/src/main/webapp/WEB-INF/dispatcher-servlet.xml
index 4800456c5..12a3e3d60 100644
--- a/src/main/webapp/WEB-INF/dispatcher-servlet.xml
+++ b/src/main/webapp/WEB-INF/dispatcher-servlet.xml
@@ -6,5 +6,5 @@
             xsi:schemaLocation="
                     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                     http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
-	
+    
 </beans>
diff --git a/src/main/webapp/WEB-INF/jsp/admin/application/create.jsp b/src/main/webapp/WEB-INF/jsp/admin/application/create.jsp
index a5e27672f..66df3075a 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/application/create.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/application/create.jsp
@@ -70,7 +70,7 @@
                 </div>
             </div>
 
-            <button id="submitButton" class="btn waves-effect waves-light" type="submit">
+            <button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
                 <fmt:message key="add" /> <i class="material-icons right">send</i>
             </button>
         </form:form>
diff --git a/src/main/webapp/WEB-INF/jsp/admin/application/edit.jsp b/src/main/webapp/WEB-INF/jsp/admin/application/edit.jsp
index a1e279dd0..90ddceef3 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/application/edit.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/application/edit.jsp
@@ -83,7 +83,7 @@
                 </div>
             </div>
 
-            <button id="submitButton" class="btn waves-effect waves-light" type="submit">
+            <button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
                 <fmt:message key="edit" /> <i class="material-icons right">send</i>
             </button>
         </form:form>    
diff --git a/src/main/webapp/WEB-INF/jsp/analytics/layout.jsp b/src/main/webapp/WEB-INF/jsp/analytics/layout.jsp
index 7b0ee8d19..5a4e18cea 100644
--- a/src/main/webapp/WEB-INF/jsp/analytics/layout.jsp
+++ b/src/main/webapp/WEB-INF/jsp/analytics/layout.jsp
@@ -45,32 +45,21 @@
         </div>
         
         <nav class="deep-purple lighten-1">
-            <div class="row nav-wrapper">
-                <div class="col s1">
+            <div class="nav-wrapper container">
+                <a id="logo-container" href="<spring:url value='/' />" class="brand-logo">
+                    <img src="<spring:url value='/static/img/logo-text-256x77.png' />" alt="elimu.ai" />
+                </a>
+                <sec:authorize access="!hasAnyRole('ROLE_ADMIN','ROLE_CONTRIBUTOR')">
+                    <ul class="right hide-on-med-and-down">
+                        <li><a href="<spring:url value='/sign-on' />"><fmt:message key="sign.on" /></a></li>
+                    </ul>
                     <ul id="nav-mobile" class="side-nav">
-                        <li>
-                            <a href="<spring:url value='/analytics' />">
-                                <img style="max-width: 100%; vertical-align: middle; max-height: 60%;" src="<spring:url value='/static/img/logo-text-256x78.png' />" alt="elimu.ai" />
-                            </a>
-                        </li>
-                        
-                        <li class="divider"></li>
-                        <li class="grey-text"><b><fmt:message key="learning.events" /></b></li>
-                        <li><a href="<spring:url value='/analytics/letter-learning-event/list' />"><i class="material-icons left">text_format</i><fmt:message key="letters" /></a></li>
-                        <li><a href="<spring:url value='/analytics/word-learning-event/list' />"><i class="material-icons left">sms</i><fmt:message key="words" /></a></li>
-                        <li><a href="<spring:url value='/analytics/storybook-learning-event/list' />"><i class="material-icons left">book</i><fmt:message key="storybooks" /></a></li>
+                        <li><a href="<spring:url value='/sign-on' />"><fmt:message key="sign.on" /></a></li>
                     </ul>
-                    <a id="navButton" href="<spring:url value='/analytics' />" data-activates="nav-mobile" class="waves-effect waves-light"><i class="material-icons">dehaze</i></a>
-                </div>
-                <div class="col s5">
-                    <a href="<spring:url value='/analytics' />" class="breadcrumb"><fmt:message key="analytics" /></a>
-                    <c:if test="${!fn:contains(pageContext.request.requestURI, '/jsp/analytics/main.jsp')}">
-                        <a class="breadcrumb"><content:gettitle /></a>
-                    </c:if>
-                </div>
-                <div class="col s6">
+                </sec:authorize>
+                <sec:authorize access="hasAnyRole('ROLE_ADMIN','ROLE_CONTRIBUTOR')">
                     <ul class="right">
-                        <a class="dropdown-button" data-activates="contributorDropdown" data-beloworigin="true" >
+                        <a href="<spring:url value='/content' />">
                             <div class="chip">
                                 <c:choose>
                                     <c:when test="${not empty contributor.imageUrl}">
@@ -93,89 +82,74 @@
                                 </c:choose>
                             </div>
                         </a>
-                        <ul id='contributorDropdown' class='dropdown-content'>
-                            <li><a href="<spring:url value='/content/contributor/${contributor.id}' />"><i class="material-icons left">art_track</i><fmt:message key="my.contributions" /></a></li>
-                            <li class="divider"></li>
-                            <li><a href="<spring:url value='/content/contributor/edit-name' />"><i class="material-icons left">mode_edit</i><fmt:message key="edit.name" /></a></li>
-                            <%--<li class="divider"></li>
-                            <li><a href="<spring:url value='/content/contributor/edit-email' />"><i class="material-icons left">mail</i><fmt:message key="edit.email" /></a></li>--%>
-                            <sec:authorize access="hasRole('ROLE_ADMIN')">
-                                <li class="divider"></li>
-                                <li><a href="<spring:url value='/admin' />"><i class="material-icons left">build</i><fmt:message key="administration" /></a></li>
-                            </sec:authorize>
-                            <sec:authorize access="hasRole('ROLE_ANALYST')">
-                                <li class="divider"></li>
-                                <li><a href="<spring:url value='/analytics' />"><i class="material-icons left">timeline</i><fmt:message key="analytics" /></a></li>
-                            </sec:authorize>
-                            <li class="divider"></li>
-                            <li><a  id="logout" href="<spring:url value='/logout' />"><i class="material-icons left">power_settings_new</i><fmt:message key="sign.out" /></a></li>
-                        </ul>
                     </ul>
-                    
-                    <ul class="right">
-                        <script>
-                            /**
-                            * Fetch token balance
-                            */
-                            async function getBalance(contributorAddress) {
-                                console.info('getBalance');
+                </sec:authorize>
+                
+                <ul class="right">
+                    <script>
+                        /**
+                        * Fetch token balance
+                        */
+                        async function getBalance(contributorAddress) {
+                            console.info('getBalance');
 
-                                // Connect to the web3 provider.
-                                const provider = await connect()
-                                window.web3 = new Web3(provider);
-                                console.info('window.web3: ' + window.web3);
+                            // Connect to the web3 provider.
+                            const provider = await connect()
+                            window.web3 = new Web3(provider);
+                            console.info('window.web3: ' + window.web3);
 
-                                var contractAbi = [{"inputs":[{"internalType":"address","name":"account","type":"address"}],"name":"balanceOf","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}];
-                                var contractAddress = '0xe29797910d413281d2821d5d9a989262c8121cc2';
-                                var contract = new window.web3.eth.Contract(contractAbi, contractAddress);
-                                var balance = await contract.methods.balanceOf(contributorAddress).call();
+                            var contractAbi = [{"inputs":[{"internalType":"address","name":"account","type":"address"}],"name":"balanceOf","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}];
+                            var contractAddress = '0xe29797910d413281d2821d5d9a989262c8121cc2';
+                            var contract = new window.web3.eth.Contract(contractAbi, contractAddress);
+                            var balance = await contract.methods.balanceOf(contributorAddress).call();
 
-                                return balance;
-                            }
-                        </script>
-                        <c:choose>
-                            <c:when test="${empty contributor.providerIdWeb3}">
-                                <a class="btn tokenButton" href="<spring:url value='/sign-on/web3' />">
-                                    <svg style="width: 24px; height: 24px; top: 6px; position: relative; right: 5px;" viewBox="0 0 784.37 1277.39" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xodm="http://www.corel.com/coreldraw/odm/2003">
-                                        <g>
-                                            <polygon fill="#343434" fill-rule="nonzero" points="392.07,0 383.5,29.11 383.5,873.74 392.07,882.29 784.13,650.54 "/>
-                                            <polygon fill="#8C8C8C" fill-rule="nonzero" points="392.07,0 -0,650.54 392.07,882.29 392.07,472.33 "/>
-                                            <polygon fill="#3C3C3B" fill-rule="nonzero" points="392.07,956.52 387.24,962.41 387.24,1263.28 392.07,1277.38 784.37,724.89 "/>
-                                            <polygon fill="#8C8C8C" fill-rule="nonzero" points="392.07,1277.38 392.07,956.52 -0,724.89 "/>
-                                            <polygon fill="#141414" fill-rule="nonzero" points="392.07,882.29 784.13,650.54 392.07,472.33 "/>
-                                            <polygon fill="#393939" fill-rule="nonzero" points="0,650.54 392.07,882.29 392.07,472.33 "/>
-                                        </g>
-                                    </svg>&nbsp;Connect wallet
-                                </a>
-                            </c:when>
-                            <c:otherwise>
-                                <c:set var="etherscanUrl" value="https://etherscan.io" />
-                                <c:if test="${applicationScope.configProperties['env'] != 'PROD'}">
-                                    <c:set var="etherscanUrl" value="https://rinkeby.etherscan.io" />
-                                </c:if>
-                                <a class="btn tokenButton" href="${etherscanUrl}/token/0xe29797910d413281d2821d5d9a989262c8121cc2?a=${contributor.providerIdWeb3}" target="_blank">
-                                    <code><span id="tokenBalance">0</span> $ELIMU</code>
-                                </a>
-                                <script>
-                                    $(function() {
-                                        var contributorAddress = '${contributor.providerIdWeb3}';
-                                        getBalance(contributorAddress).then(function(result) {
-                                            console.info('result: ' + result);
+                            return balance;
+                        }
+                    </script>
+                    <c:choose>
+                        <c:when test="${empty contributor.providerIdWeb3}">
+                            <a class="btn tokenButton" href="<spring:url value='/sign-on/web3' />">
+                                <svg style="width: 24px; height: 24px; top: 6px; position: relative; right: 5px;" viewBox="0 0 784.37 1277.39" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xodm="http://www.corel.com/coreldraw/odm/2003">
+                                    <g>
+                                        <polygon fill="#343434" fill-rule="nonzero" points="392.07,0 383.5,29.11 383.5,873.74 392.07,882.29 784.13,650.54 "/>
+                                        <polygon fill="#8C8C8C" fill-rule="nonzero" points="392.07,0 -0,650.54 392.07,882.29 392.07,472.33 "/>
+                                        <polygon fill="#3C3C3B" fill-rule="nonzero" points="392.07,956.52 387.24,962.41 387.24,1263.28 392.07,1277.38 784.37,724.89 "/>
+                                        <polygon fill="#8C8C8C" fill-rule="nonzero" points="392.07,1277.38 392.07,956.52 -0,724.89 "/>
+                                        <polygon fill="#141414" fill-rule="nonzero" points="392.07,882.29 784.13,650.54 392.07,472.33 "/>
+                                        <polygon fill="#393939" fill-rule="nonzero" points="0,650.54 392.07,882.29 392.07,472.33 "/>
+                                    </g>
+                                </svg>&nbsp;Connect wallet
+                            </a>
+                        </c:when>
+                        <c:otherwise>
+                            <c:set var="etherscanUrl" value="https://etherscan.io" />
+                            <c:if test="${applicationScope.configProperties['env'] != 'PROD'}">
+                                <c:set var="etherscanUrl" value="https://rinkeby.etherscan.io" />
+                            </c:if>
+                            <a class="btn tokenButton" href="${etherscanUrl}/token/0xe29797910d413281d2821d5d9a989262c8121cc2?a=${contributor.providerIdWeb3}" target="_blank">
+                                <code><span id="tokenBalance">0</span> $ELIMU</code>
+                            </a>
+                            <script>
+                                $(function() {
+                                    var contributorAddress = '${contributor.providerIdWeb3}';
+                                    getBalance(contributorAddress).then(function(result) {
+                                        console.info('result: ' + result);
 
-                                            var tokenBalance = result / 1000000000000000000;
-                                            console.info('tokenBalance: ' + tokenBalance);
+                                        var tokenBalance = result / 1000000000000000000;
+                                        console.info('tokenBalance: ' + tokenBalance);
 
-                                            var tokenBalanceFormatted = Intl.NumberFormat().format(Math.round(tokenBalance));
-                                            console.info('tokenBalanceFormatted ' + tokenBalanceFormatted);
+                                        var tokenBalanceFormatted = Intl.NumberFormat().format(Math.round(tokenBalance));
+                                        console.info('tokenBalanceFormatted ' + tokenBalanceFormatted);
 
-                                            $('#tokenBalance').html(tokenBalanceFormatted);
-                                        });
+                                        $('#tokenBalance').html(tokenBalanceFormatted);
                                     });
-                                </script>
-                            </c:otherwise>
-                        </c:choose>
-                    </ul>
-                </div>
+                                });
+                            </script>
+                        </c:otherwise>
+                    </c:choose>
+                </ul>
+                
+                <a href="#" data-activates="nav-mobile" class="button-collapse"><i class="material-icons">menu</i></a>
             </div>
         </nav>
         
diff --git a/src/main/webapp/WEB-INF/jsp/analytics/storybook-learning-event/list.jsp b/src/main/webapp/WEB-INF/jsp/analytics/storybook-learning-event/list.jsp
index cc9df69ec..295c83d1a 100644
--- a/src/main/webapp/WEB-INF/jsp/analytics/storybook-learning-event/list.jsp
+++ b/src/main/webapp/WEB-INF/jsp/analytics/storybook-learning-event/list.jsp
@@ -53,7 +53,7 @@
     
         <table class="bordered highlight">
             <thead>
-                <th>time</th>
+                <th>timestamp</th>
                 <th>android_id</th>
                 <th>package_name</th>
                 <th>storybook_id</th>
@@ -64,7 +64,7 @@
                 <c:forEach var="storyBookLearningEvent" items="${storyBookLearningEvents}">
                     <tr class="storyBookLearningEvent">
                         <td>
-                            <fmt:formatDate value="${storyBookLearningEvent.time.time}" pattern="yyyy-MM-dd" />
+                            <fmt:formatDate value="${storyBookLearningEvent.timestamp.time}" pattern="yyyy-MM-dd" />
                         </td>   
                         <td>
                             ${storyBookLearningEvent.androidId}
diff --git a/src/main/webapp/WEB-INF/jsp/content/contributor/add-email.jsp b/src/main/webapp/WEB-INF/jsp/content/contributor/add-email.jsp
index 6b77693fe..0fd41fc85 100644
--- a/src/main/webapp/WEB-INF/jsp/content/contributor/add-email.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/contributor/add-email.jsp
@@ -14,7 +14,7 @@
                     </div>
                 </div>
 
-                <button id="submitButton" class="btn waves-effect waves-light" type="submit">
+                <button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
                     <fmt:message key="save" /> <i class="material-icons right">send</i>
                 </button>
             </form>
diff --git a/src/main/webapp/WEB-INF/jsp/content/contributor/edit-motivation.jsp b/src/main/webapp/WEB-INF/jsp/content/contributor/edit-motivation.jsp
index 50fe435be..9ce57f70a 100644
--- a/src/main/webapp/WEB-INF/jsp/content/contributor/edit-motivation.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/contributor/edit-motivation.jsp
@@ -26,7 +26,7 @@
                     </div>
                 </div>
 
-                <button id="submitButton" class="btn waves-effect waves-light" type="submit">
+                <button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
                     <fmt:message key="save" /> <i class="material-icons right">send</i>
                 </button>
             </form>
diff --git a/src/main/webapp/WEB-INF/jsp/content/contributor/edit-name.jsp b/src/main/webapp/WEB-INF/jsp/content/contributor/edit-name.jsp
index 5dc625410..ad4e31235 100644
--- a/src/main/webapp/WEB-INF/jsp/content/contributor/edit-name.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/contributor/edit-name.jsp
@@ -18,7 +18,7 @@
                     </div>
                 </div>
 
-                <button id="submitButton" class="btn waves-effect waves-light" type="submit">
+                <button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
                     <fmt:message key="save" /> <i class="material-icons right">send</i>
                 </button>
             </form>
diff --git a/src/main/webapp/WEB-INF/jsp/content/emoji/create.jsp b/src/main/webapp/WEB-INF/jsp/content/emoji/create.jsp
index 32e76f5ac..0186fdcef 100644
--- a/src/main/webapp/WEB-INF/jsp/content/emoji/create.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/emoji/create.jsp
@@ -25,7 +25,7 @@
                 </div>
             </div>
 
-            <button id="submitButton" class="btn waves-effect waves-light" type="submit">
+            <button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
                 <fmt:message key="add" /> <i class="material-icons right">send</i>
             </button>
         </form:form>
diff --git a/src/main/webapp/WEB-INF/jsp/content/emoji/edit.jsp b/src/main/webapp/WEB-INF/jsp/content/emoji/edit.jsp
index 1ef49bdb3..09d8a7eec 100644
--- a/src/main/webapp/WEB-INF/jsp/content/emoji/edit.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/emoji/edit.jsp
@@ -27,7 +27,7 @@
                 </div>
             </div>
 
-            <button id="submitButton" class="btn waves-effect waves-light" type="submit">
+            <button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
                 <fmt:message key="edit" /> <i class="material-icons right">send</i>
             </button>
             <a href="<spring:url value='/content/emoji/delete/${emoji.id}' />" class="waves-effect waves-red red-text btn-flat right"><fmt:message key="delete" /></a>
diff --git a/src/main/webapp/WEB-INF/jsp/content/letter-sound/create.jsp b/src/main/webapp/WEB-INF/jsp/content/letter-sound/create.jsp
index 754620d08..235d128d3 100644
--- a/src/main/webapp/WEB-INF/jsp/content/letter-sound/create.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/letter-sound/create.jsp
@@ -139,7 +139,7 @@
                 </div>
             </div>
 
-            <button id="submitButton" class="btn waves-effect waves-light" type="submit">
+            <button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
                 <fmt:message key="add" /> <i class="material-icons right">send</i>
             </button>
         </form:form>
diff --git a/src/main/webapp/WEB-INF/jsp/content/letter-sound/edit.jsp b/src/main/webapp/WEB-INF/jsp/content/letter-sound/edit.jsp
index f6a0094a5..8d41a7fba 100644
--- a/src/main/webapp/WEB-INF/jsp/content/letter-sound/edit.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/letter-sound/edit.jsp
@@ -141,7 +141,7 @@
                 </div>
             </div>
 
-            <button id="submitButton" class="btn waves-effect waves-light" type="submit">
+            <button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
                 <fmt:message key="edit" /> <i class="material-icons right">send</i>
             </button>
         </form:form>
@@ -192,7 +192,7 @@
                 <label for="comment"><fmt:message key="comment" /></label>
                 <textarea id="comment" name="comment" class="materialize-textarea"></textarea>
 
-                <button class="btn waves-effect waves-light" type="submit">
+                <button class="btn-large waves-effect waves-light" type="submit">
                     <fmt:message key="submit" /> <i class="material-icons right">send</i>
                 </button>
             </div>
diff --git a/src/main/webapp/WEB-INF/jsp/content/letter/create.jsp b/src/main/webapp/WEB-INF/jsp/content/letter/create.jsp
index dbd1ac954..7f81db41a 100644
--- a/src/main/webapp/WEB-INF/jsp/content/letter/create.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/letter/create.jsp
@@ -34,7 +34,7 @@
                 </div>
             </div>
 
-            <button id="submitButton" class="btn waves-effect waves-light" type="submit">
+            <button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
                 <fmt:message key="add" /> <i class="material-icons right">send</i>
             </button>
         </form:form>
diff --git a/src/main/webapp/WEB-INF/jsp/content/letter/edit.jsp b/src/main/webapp/WEB-INF/jsp/content/letter/edit.jsp
index 45bb7e8a6..835913990 100644
--- a/src/main/webapp/WEB-INF/jsp/content/letter/edit.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/letter/edit.jsp
@@ -53,7 +53,7 @@
                 </div>
             </div>
 
-            <button id="submitButton" class="btn waves-effect waves-light" type="submit">
+            <button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
                 <fmt:message key="edit" /> <i class="material-icons right">send</i>
             </button>
             <a href="<spring:url value='/content/letter/delete/${letter.id}' />" class="waves-effect waves-red red-text btn-flat right"><fmt:message key="delete" /></a>
diff --git a/src/main/webapp/WEB-INF/jsp/content/letter/list.jsp b/src/main/webapp/WEB-INF/jsp/content/letter/list.jsp
index 58ea89c1c..4b2d53285 100644
--- a/src/main/webapp/WEB-INF/jsp/content/letter/list.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/letter/list.jsp
@@ -44,12 +44,12 @@
                             </td>
                             <td>
                                 <c:choose>
-                                	<c:when test="${letter.diacritic}">
-                                		<fmt:message key="yes" />
-                                	</c:when>
-                                	<c:otherwise>
-                                		<fmt:message key="no" />
-                                	</c:otherwise>
+                                    <c:when test="${letter.diacritic}">
+                                        <fmt:message key="yes" />
+                                    </c:when>
+                                    <c:otherwise>
+                                        <fmt:message key="no" />
+                                    </c:otherwise>
                                 </c:choose>
                             </td>
                             <td>
diff --git a/src/main/webapp/WEB-INF/jsp/content/multimedia/audio/create.jsp b/src/main/webapp/WEB-INF/jsp/content/multimedia/audio/create.jsp
index 9433276f9..3a93ba519 100644
--- a/src/main/webapp/WEB-INF/jsp/content/multimedia/audio/create.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/multimedia/audio/create.jsp
@@ -101,7 +101,7 @@
                 </div>
             </div>
 
-            <button id="submitButton" class="btn waves-effect waves-light" type="submit">
+            <button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
                 <fmt:message key="add" /> <i class="material-icons right">send</i>
             </button>
         </form:form>
diff --git a/src/main/webapp/WEB-INF/jsp/content/multimedia/image/create.jsp b/src/main/webapp/WEB-INF/jsp/content/multimedia/image/create.jsp
index 43e2463d3..b6c879148 100644
--- a/src/main/webapp/WEB-INF/jsp/content/multimedia/image/create.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/multimedia/image/create.jsp
@@ -74,7 +74,7 @@
                 </div>
             </div>
 
-            <button id="submitButton" class="btn waves-effect waves-light" type="submit">
+            <button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
                 <fmt:message key="add" /> <i class="material-icons right">send</i>
             </button>
         </form:form>
diff --git a/src/main/webapp/WEB-INF/jsp/content/multimedia/image/edit.jsp b/src/main/webapp/WEB-INF/jsp/content/multimedia/image/edit.jsp
index de0e3e2f3..c8612c896 100644
--- a/src/main/webapp/WEB-INF/jsp/content/multimedia/image/edit.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/multimedia/image/edit.jsp
@@ -92,7 +92,7 @@
                 </div>
             </div>
 
-            <button id="submitButton" class="btn waves-effect waves-light" type="submit">
+            <button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
                 <fmt:message key="edit" /> <i class="material-icons right">send</i>
             </button>
             <sec:authorize access="hasRole('ROLE_EDITOR')">
diff --git a/src/main/webapp/WEB-INF/jsp/content/multimedia/video/create.jsp b/src/main/webapp/WEB-INF/jsp/content/multimedia/video/create.jsp
index be4ddc778..7bd10f266 100644
--- a/src/main/webapp/WEB-INF/jsp/content/multimedia/video/create.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/multimedia/video/create.jsp
@@ -75,7 +75,7 @@
                 </div>
             </div>
 
-            <button id="submitButton" class="btn waves-effect waves-light" type="submit">
+            <button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
                 <fmt:message key="add" /> <i class="material-icons right">send</i>
             </button>
         </form:form>
diff --git a/src/main/webapp/WEB-INF/jsp/content/multimedia/video/edit.jsp b/src/main/webapp/WEB-INF/jsp/content/multimedia/video/edit.jsp
index 81b660bea..bf421d6d4 100644
--- a/src/main/webapp/WEB-INF/jsp/content/multimedia/video/edit.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/multimedia/video/edit.jsp
@@ -79,7 +79,7 @@
                 </div>
             </div>
 
-            <button id="submitButton" class="btn waves-effect waves-light" type="submit">
+            <button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
                 <fmt:message key="edit" /> <i class="material-icons right">send</i>
             </button>
             <a href="<spring:url value='/content/multimedia/video/delete/${video.id}' />" class="waves-effect waves-red red-text btn-flat right"><fmt:message key="delete" /></a>
diff --git a/src/main/webapp/WEB-INF/jsp/content/number/create.jsp b/src/main/webapp/WEB-INF/jsp/content/number/create.jsp
index 33fc2a6f8..1391fb8dd 100644
--- a/src/main/webapp/WEB-INF/jsp/content/number/create.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/number/create.jsp
@@ -91,7 +91,7 @@
                 </div>
             </div>
 
-            <button id="submitButton" class="btn waves-effect waves-light" type="submit">
+            <button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
                 <fmt:message key="add" /> <i class="material-icons right">send</i>
             </button>
         </form:form>
diff --git a/src/main/webapp/WEB-INF/jsp/content/number/edit.jsp b/src/main/webapp/WEB-INF/jsp/content/number/edit.jsp
index 8b6cc2bd8..d11b4eb0f 100644
--- a/src/main/webapp/WEB-INF/jsp/content/number/edit.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/number/edit.jsp
@@ -109,7 +109,7 @@
                 </div>
             </div>
 
-            <button id="submitButton" class="btn waves-effect waves-light" type="submit">
+            <button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
                 <fmt:message key="edit" /> <i class="material-icons right">send</i>
             </button>
             <a href="<spring:url value='/content/number/delete/${number.id}' />" class="waves-effect waves-red red-text btn-flat right"><fmt:message key="delete" /></a>
diff --git a/src/main/webapp/WEB-INF/jsp/content/sound/create.jsp b/src/main/webapp/WEB-INF/jsp/content/sound/create.jsp
index 124db2ea1..13bc9b9b1 100644
--- a/src/main/webapp/WEB-INF/jsp/content/sound/create.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/sound/create.jsp
@@ -39,7 +39,7 @@
                 </div>
             </div>
 
-            <button id="submitButton" class="btn waves-effect waves-light" type="submit">
+            <button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
                 <fmt:message key="add" /> <i class="material-icons right">send</i>
             </button>
         </form:form>
diff --git a/src/main/webapp/WEB-INF/jsp/content/sound/edit.jsp b/src/main/webapp/WEB-INF/jsp/content/sound/edit.jsp
index deb4fa272..f18490f73 100644
--- a/src/main/webapp/WEB-INF/jsp/content/sound/edit.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/sound/edit.jsp
@@ -58,7 +58,7 @@
                 </div>
             </div>
 
-            <button id="submitButton" class="btn waves-effect waves-light" type="submit">
+            <button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
                 <fmt:message key="edit" /> <i class="material-icons right">send</i>
             </button>
         </form:form>
diff --git a/src/main/webapp/WEB-INF/jsp/content/storybook/chapter/create.jsp b/src/main/webapp/WEB-INF/jsp/content/storybook/chapter/create.jsp
index d735d659e..c9b45ffb6 100644
--- a/src/main/webapp/WEB-INF/jsp/content/storybook/chapter/create.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/storybook/chapter/create.jsp
@@ -23,7 +23,7 @@
                 </div>
             </div>
             
-            <button id="submitButton" class="btn waves-effect waves-light" type="submit">
+            <button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
                 <fmt:message key="add" /> <i class="material-icons right">send</i>
             </button>
         </form:form>
diff --git a/src/main/webapp/WEB-INF/jsp/content/storybook/create.jsp b/src/main/webapp/WEB-INF/jsp/content/storybook/create.jsp
index 2a36103ef..3d324a55f 100644
--- a/src/main/webapp/WEB-INF/jsp/content/storybook/create.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/storybook/create.jsp
@@ -68,7 +68,7 @@
                 </div>
             </div>
 
-            <button id="submitButton" class="btn waves-effect waves-light" type="submit">
+            <button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
                 <fmt:message key="add" /> <i class="material-icons right">send</i>
             </button>
         </form:form>
diff --git a/src/main/webapp/WEB-INF/jsp/content/storybook/edit.jsp b/src/main/webapp/WEB-INF/jsp/content/storybook/edit.jsp
index d607375e9..4610f1c32 100644
--- a/src/main/webapp/WEB-INF/jsp/content/storybook/edit.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/storybook/edit.jsp
@@ -88,7 +88,7 @@
                 </div>
             </div>
 
-            <button id="submitButton" class="btn waves-effect waves-light" type="submit">
+            <button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
                 <fmt:message key="edit" /> <i class="material-icons right">send</i>
             </button>
         </form:form>
diff --git a/src/main/webapp/WEB-INF/jsp/content/storybook/paragraph/create.jsp b/src/main/webapp/WEB-INF/jsp/content/storybook/paragraph/create.jsp
index a3d5f2f91..40356666d 100644
--- a/src/main/webapp/WEB-INF/jsp/content/storybook/paragraph/create.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/storybook/paragraph/create.jsp
@@ -25,7 +25,7 @@
                 </div>
             </div>
 
-            <button id="submitButton" class="btn waves-effect waves-light" type="submit">
+            <button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
                 <fmt:message key="add" /> <i class="material-icons right">send</i>
             </button>
         </form:form>
diff --git a/src/main/webapp/WEB-INF/jsp/content/storybook/paragraph/edit.jsp b/src/main/webapp/WEB-INF/jsp/content/storybook/paragraph/edit.jsp
index 9c4982ad0..1e5e1e2ae 100644
--- a/src/main/webapp/WEB-INF/jsp/content/storybook/paragraph/edit.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/storybook/paragraph/edit.jsp
@@ -28,7 +28,7 @@
                 </div>
             </div>
 
-            <button id="submitButton" class="btn waves-effect waves-light" type="submit">
+            <button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
                 <fmt:message key="edit" /> <i class="material-icons right">send</i>
             </button>
             <sec:authorize access="hasRole('ROLE_EDITOR')">
diff --git a/src/main/webapp/WEB-INF/jsp/content/word/create.jsp b/src/main/webapp/WEB-INF/jsp/content/word/create.jsp
index d21f6f999..72a41becf 100644
--- a/src/main/webapp/WEB-INF/jsp/content/word/create.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/word/create.jsp
@@ -144,7 +144,7 @@
                 </div>
             </div>
 
-            <button id="submitButton" class="btn waves-effect waves-light" type="submit">
+            <button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
                 <fmt:message key="add" /> <i class="material-icons right">send</i>
             </button>
         </form:form>
diff --git a/src/main/webapp/WEB-INF/jsp/content/word/edit.jsp b/src/main/webapp/WEB-INF/jsp/content/word/edit.jsp
index 318606f98..a5e0ff888 100644
--- a/src/main/webapp/WEB-INF/jsp/content/word/edit.jsp
+++ b/src/main/webapp/WEB-INF/jsp/content/word/edit.jsp
@@ -163,7 +163,7 @@
                 </div>
             </div>
 
-            <button id="submitButton" class="btn waves-effect waves-light" type="submit">
+            <button id="submitButton" class="btn-large waves-effect waves-light" type="submit">
                 <fmt:message key="edit" /> <i class="material-icons right">send</i>
             </button>
             <sec:authorize access="hasRole('ROLE_EDITOR')">
diff --git a/src/main/webapp/WEB-INF/jsp/layout.jsp b/src/main/webapp/WEB-INF/jsp/layout.jsp
index 36e8cfa0f..c75f0ba67 100644
--- a/src/main/webapp/WEB-INF/jsp/layout.jsp
+++ b/src/main/webapp/WEB-INF/jsp/layout.jsp
@@ -217,7 +217,7 @@
                                 Chat<i class="material-icons right">forum</i>
                             </a>
                           </div>
-                          <div class="col l2 s12">
+                          <div class="col l2 s12 right-align">
                             <h5 class="white-text">Socials</h5>
                             <ul>
                                 <li><a class="white-text" href="https://twitter.com/elimu_ai" target="_blank">Twitter</a></li>
@@ -236,7 +236,7 @@
                                 <a class="white-text" href="https://opensource.org/licenses/MIT">MIT License</a> &nbsp; | &nbsp; <fmt:message key="see.our" />&nbsp;<a class="white-text" href="https://github.com/elimu-ai">code repository</a><br />
                                 <a class="white-text" href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a> &nbsp; | &nbsp; <fmt:message key="see.our" />&nbsp;<a class="white-text" href="<spring:url value='/content' />">content repository</a><br />
                             </div>
-                            <div class="col s12 m6">
+                            <div class="col s12 m6 right-align">
                                 Supported languages: 
                                 <c:choose>
                                     <c:when test="${applicationScope.configProperties['env'] == 'DEV'}">
@@ -263,7 +263,8 @@
                                             <a class="white-text" href="https://${supportedLanguage.isoCode}.elimu.ai" title="${supportedLanguage.nativeName} (${supportedLanguage.englishName})">${supportedLanguage.isoCode}</a>
                                         </c:forEach>
                                     </c:otherwise>
-                                </c:choose>
+                                </c:choose><br />
+                                Webapp version: <a class="white-text" href="https://github.com/elimu-ai/webapp/releases"><code>${applicationScope.configProperties['pom.version']}</code></a>
                             </div>
                           </div>
                       </div>
diff --git a/src/main/webapp/WEB-INF/jsp/welcome.jsp b/src/main/webapp/WEB-INF/jsp/welcome.jsp
index 423535aae..f1c3aef0d 100644
--- a/src/main/webapp/WEB-INF/jsp/welcome.jsp
+++ b/src/main/webapp/WEB-INF/jsp/welcome.jsp
@@ -56,7 +56,7 @@
 
           <div class="col s12 m4">
             <div class="icon-block">
-              <h2 class="center amber-text darken-2"><i class="material-icons medium">auto_graph</i></h2>
+              <h2 class="center amber-text text-darken-2"><i class="material-icons medium">auto_graph</i></h2>
               <h4 class="center"><fmt:message key="solution" /></h4>
 
               <p class="light center">Build innovative learning software that empowers out-of-school children to teach themselves basic reading📖, writing✍🏽 and math🔢 <b>within 6 months</b>.</p>
@@ -69,7 +69,7 @@
             
     <div class="section">
         <div class="row">
-            <div class="col s12 offset-m2 m4">
+            <div class="col s12 offset-m1 m5">
                 <h5 class="header">Educational Apps & Games 🎲🕹</h5>
                 <p>
                     A collection of educational Android <a href="<spring:url value='/apps' />">apps</a> teaches children 
@@ -79,13 +79,13 @@
                     Each child can learn <i>fully autonomously</i>, without depending on the availability of qualified teachers.  
                 </p>
             </div>
-            <div class="col s12 m4">
-                <img src="https://github.blog/wp-content/uploads/2019/05/xprize-no-text.png?w=1200" style="border-radius: 8px;" />
+            <div class="col s12 m5">
+                <img style="border-radius: 8px; outline: 8px solid #d1c4e9;" src="https://github.blog/wp-content/uploads/2019/05/xprize-no-text.png?w=1200" style="border-radius: 8px;" />
             </div>
         </div>
         
         <div class="row">
-            <div class="col s12 offset-m2 m4">
+            <div class="col s12 offset-m1 m5">
                 <h5 class="header">Personalized Learning 🚀</h5>
                 <p>
                     Each child is guided through the curriculum by our AI tutor <i>Nya</i> and her robot companion.
@@ -96,13 +96,13 @@
                     level.
                 </p>
             </div>
-            <div class="col s12 m4">
-                <img src="https://user-images.githubusercontent.com/15718174/26873794-641bfbfc-4b7b-11e7-95ee-82b19b661ad5.png" style="border-radius: 8px;" />
+            <div class="col s12 m5">
+                <img style="border-radius: 8px; outline: 8px solid #d1c4e9;" src="https://user-images.githubusercontent.com/15718174/26873794-641bfbfc-4b7b-11e7-95ee-82b19b661ad5.png" style="border-radius: 8px;" />
             </div>
         </div>
         
         <div class="row">
-            <div class="col s12 offset-m2 m4">
+            <div class="col s12 offset-m1 m5">
                 <h5 class="header">Learning Platform 🧩</h5>
                 <p>
                     The elimu.ai software is a <i>platform</i> of educational content and Android 
@@ -115,13 +115,13 @@
                     As the child demonstrates mastery of prerequisite skills, the AI tutor gradually unlocks more advanced content.
                 </p>
             </div>
-            <div class="col s12 m4">
-                <img src="https://user-images.githubusercontent.com/15718174/27299402-95bea44c-552c-11e7-84ab-217cdca758e4.gif" style="border-radius: 8px;" />
+            <div class="col s12 m5">
+                <img style="border-radius: 8px; outline: 8px solid #d1c4e9;" src="https://user-images.githubusercontent.com/15718174/27299402-95bea44c-552c-11e7-84ab-217cdca758e4.gif" style="border-radius: 8px;" />
             </div>
         </div>
         
         <div class="row">
-            <div class="col s12 offset-m2 m4">
+            <div class="col s12 offset-m1 m5">
                 <h5 class="header">Free and Open Source Software (FOSS) 👩🏽‍💻</h5>
                 <p>
                     All the code is publicly available on <a href="https://github.com/elimu-ai" target="_blank">GitHub</a> as Free and Open Source Software (FOSS), released under the <a href="https://opensource.org/license/MIT" target="_blank">MIT License</a>.
@@ -130,8 +130,8 @@
                     Any individual or organization is welcome to fork the existing code and adapt it to their local needs.
                 </p>
             </div>
-            <div class="col s12 m4">
-                <img src="https://user-images.githubusercontent.com/15718174/27515871-41872c60-59ae-11e7-9b2d-3ca886d0d7f2.png" style="border-radius: 8px;" />
+            <div class="col s12 m5">
+                <img style="border-radius: 8px; outline: 8px solid #d1c4e9;" src="https://user-images.githubusercontent.com/15718174/27515871-41872c60-59ae-11e7-9b2d-3ca886d0d7f2.png" style="border-radius: 8px;" />
             </div>
         </div>
     </div>
diff --git a/src/main/webapp/WEB-INF/spring/applicationContext-security.xml b/src/main/webapp/WEB-INF/spring/applicationContext-security.xml
index f7824e6d1..97ed54b09 100644
--- a/src/main/webapp/WEB-INF/spring/applicationContext-security.xml
+++ b/src/main/webapp/WEB-INF/spring/applicationContext-security.xml
@@ -17,7 +17,6 @@
         <form-login login-page="/sign-on" authentication-failure-url="/sign-on?error" />
 
         <intercept-url pattern="/admin/**" access="hasRole('ROLE_ADMIN')" />
-        <intercept-url pattern="/analytics/**" access="hasRole('ROLE_ANALYST')" />
         <intercept-url pattern="/content/**" access="hasRole('ROLE_CONTRIBUTOR')" />
 
         <logout />
diff --git a/src/main/webapp/static/css/content/styles.css b/src/main/webapp/static/css/content/styles.css
index d75e2c446..483b96e02 100644
--- a/src/main/webapp/static/css/content/styles.css
+++ b/src/main/webapp/static/css/content/styles.css
@@ -46,7 +46,7 @@ nav {
 #labeledVideos img {
     width: 47%;
     margin-right: 2%;
-    border-radius: 4px;
+    border-radius: 8px;
 }
 #imageEditPage #image img {
     display: block;
@@ -88,7 +88,7 @@ blockquote,
 .row.peerReviewEvent {
     padding: 0.5rem;
     margin: 0 0 1px 0;
-    border-radius: 4px;
+    border-radius: 8px;
 }
 .row.peerReviewEvent.indent {
     margin-left: 1.5rem;
diff --git a/src/main/webapp/static/css/styles.css b/src/main/webapp/static/css/styles.css
index adc988eb3..ca172b932 100644
--- a/src/main/webapp/static/css/styles.css
+++ b/src/main/webapp/static/css/styles.css
@@ -106,10 +106,12 @@ footer.page-footer .footer-copyright {
 .card .card-action:last-child {
     border-radius: 0 0 8px 8px;
 }
-.btn,
-.btn-large {
+.btn {
     border-radius: 4px;
 }
+.btn-large {
+    border-radius: 8px;
+}
 .btn-floating {
     border-radius: 50%;
 }
diff --git a/src/test/java/ai/elimu/dao/BaseDaoTest.java b/src/test/java/ai/elimu/dao/BaseDaoTest.java
index 15e00cd93..352c821b3 100644
--- a/src/test/java/ai/elimu/dao/BaseDaoTest.java
+++ b/src/test/java/ai/elimu/dao/BaseDaoTest.java
@@ -13,7 +13,7 @@
     "file:src/main/webapp/WEB-INF/spring/applicationContext-jpa.xml"
 })
 public class BaseDaoTest {
-	
+    
     @Autowired
     private ImageDao imageDao;
 
diff --git a/src/test/java/ai/elimu/dao/ContributorDaoTest.java b/src/test/java/ai/elimu/dao/ContributorDaoTest.java
index 33049724a..f37e795da 100644
--- a/src/test/java/ai/elimu/dao/ContributorDaoTest.java
+++ b/src/test/java/ai/elimu/dao/ContributorDaoTest.java
@@ -19,7 +19,7 @@
 public class ContributorDaoTest {
     
     private Logger logger = LogManager.getLogger();
-	
+    
     @Autowired
     private ContributorDao contributorDao;
 
diff --git a/src/test/java/ai/elimu/dao/ImageDaoTest.java b/src/test/java/ai/elimu/dao/ImageDaoTest.java
index 50f8c425e..74d960ea1 100644
--- a/src/test/java/ai/elimu/dao/ImageDaoTest.java
+++ b/src/test/java/ai/elimu/dao/ImageDaoTest.java
@@ -25,7 +25,7 @@ public class ImageDaoTest {
     
     @Autowired
     private WordDao wordDao;
-	
+    
     @Autowired
     private ImageDao imageDao;
 
diff --git a/src/test/java/selenium/web/WelcomePageTest.java b/src/test/java/selenium/web/WelcomePageTest.java
index 094b64e6c..2e7ffc9a9 100644
--- a/src/test/java/selenium/web/WelcomePageTest.java
+++ b/src/test/java/selenium/web/WelcomePageTest.java
@@ -20,7 +20,7 @@ public void setUp() {
         
         // See https://www.selenium.dev/documentation/en/webdriver/driver_requirements/#chromium-chrome
         System.setProperty("webdriver.chrome.driver", "src/test/resources/selenium/chrome_80.0.3987.106/chromedriver_mac64/chromedriver");
-    	driver = new ChromeDriver();
+        driver = new ChromeDriver();
         driver.get(DomainHelper.getBaseUrl());
     }
 
@@ -28,6 +28,6 @@ public void setUp() {
     public void testWelcomePage() {
         logger.info("testWelcomePage");
         
-    	WelcomePage welcomePage = new WelcomePage(driver);
+        WelcomePage welcomePage = new WelcomePage(driver);
     }
 }