diff --git a/src/application.c b/src/application.c
index ce2a115..925dbbf 100644
--- a/src/application.c
+++ b/src/application.c
@@ -1,62 +1,77 @@
 #include "application.h"
 
-#include "defs.h"
 #include "style.h"
 #include <SDL3/SDL.h>
 #include <clay/clay.h>
 
-static inline
-void DiceContainer() {
-	CLAY(CLAY_ID("DiceContainer"), {
+static inline void DiceSelectorContainer() {
+	CLAY(CLAY_ID("DiceSelector"), {
 		.layout = {
-			.sizing = { CLAY_SIZING_GROW(0), CLAY_SIZING_PERCENT(0.2) },
-			.padding = CLAY_PADDING_ALL(16),
+			.layoutDirection = CLAY_TOP_TO_BOTTOM,
+			.sizing = { CLAY_SIZING_FIXED(300), CLAY_SIZING_GROW(0) },
+			.padding = containerPadding,
+			.childGap = paragraphGap,
 		},
-		.backgroundColor = containerColors[0],
-		.cornerRadius = defaultRadiusAll,
+		.INNER_CONTAINER(0)
 	}) {
-		CLAY_TEXT(CLAY_STRING("Text data"), CLAY_TEXT_CONFIG({
-			TEXT_BODY,
-			.textColor = textColors[0]
+	}
+}
+
+static inline void ActiveDiceContainer() {
+	CLAY(CLAY_ID("ActiveDice"), {
+		.layout = {
+			.layoutDirection = CLAY_TOP_TO_BOTTOM,
+			.sizing = { CLAY_SIZING_GROW(0), CLAY_SIZING_GROW(0) },
+			.padding = containerPadding,
+			.childGap = paragraphGap,
+		},
+		.INNER_CONTAINER(0)
+	}) {
+		CLAY_TEXT(CLAY_STRING("Header Text"), CLAY_TEXT_CONFIG({
+			.H(1, 0),
+		}));
+		CLAY_TEXT(CLAY_STRING("Content text"), CLAY_TEXT_CONFIG({
+			.BODY(0),
 		}));
 	}
 }
 
-static inline
-void DiceLogContainer() {
+static inline void DiceContainer() {
+	CLAY(CLAY_ID("DiceContainer"), {
+		.layout = {
+			.layoutDirection = CLAY_LEFT_TO_RIGHT,
+			.sizing = { CLAY_SIZING_GROW(0), CLAY_SIZING_PERCENT(0.4) },
+			.childGap = containerGap
+		},
+	}) {
+		DiceSelectorContainer();
+		ActiveDiceContainer();
+	}
+}
+
+static inline void DiceLogContainer() {
 	CLAY(CLAY_ID("LogContainer"), {
 		.layout = {
 			.sizing = layoutExpand,
 			.padding = CLAY_PADDING_ALL(16),
 		},
-		.backgroundColor = containerColors[0],
-		.cornerRadius = defaultRadiusAll
+		.INNER_CONTAINER(0)
 	}) {}
 }
 
-static inline
-void InitiativeListContainer() {
+static inline void InitiativeListContainer() {
 	CLAY(CLAY_ID("InitiativeListContainer"), {
 		.layout = {
 			.sizing = layoutExpand,
 			.padding = CLAY_PADDING_ALL(16),
 		},
-		.backgroundColor = containerColors[0],
-		.cornerRadius = defaultRadiusAll,
+		.INNER_CONTAINER(0)
 	}) {}
 }
 
 Clay_RenderCommandArray RenderApplication() {
 	Clay_BeginLayout();
-	CLAY(CLAY_ID("OuterContainer"), {
-		.layout = {
-			.layoutDirection = CLAY_TOP_TO_BOTTOM,
-			.sizing = layoutExpand,
-			.padding = CLAY_PADDING_ALL(windowPadding),
-			.childGap = containerGap,
-		},
-		.backgroundColor = windowBackground
-	}) {
+	CLAY(CLAY_ID("OuterContainer"), windowStyle) {
 		DiceContainer();
 		CLAY(CLAY_ID("LowerSplitContainer"), {
 			.layout = {