diff --git a/example/main.odin b/example/main.odin
index f2dea33..8d10b15 100644
--- a/example/main.odin
+++ b/example/main.odin
@@ -56,6 +56,7 @@ main :: proc() {
 	button_config := ui.ElementConfiguration {margin = {4.0, 4.0}}
 	button_margin_value_string_x := cstring(make([^]u8, INPUT_FLOAT_CHARACTERS))
 	button_margin_value_string_y := cstring(make([^]u8, INPUT_FLOAT_CHARACTERS))
+	element_focus_id := ui.element_id_invalid()
 
 	for !rl.WindowShouldClose() {
 		ui.start(&ctx, origin = {0, 0}, size = {WINDOW_WIDTH, WINDOW_HEIGHT})
@@ -64,7 +65,7 @@ main :: proc() {
 				for j in 0..<10 {
 					config := button_config
 					config.label = fmt.ctprintf("%d", i * 10 + j)
-					ui.button(dimensions = {ui.Size_Pixels(64.0), ui.Size_Percentage(1.0)}, config = config)
+					ui.element(.Button, dimensions = {ui.Size_Pixels(64.0), ui.Size_Percentage(1.0)}, config = config)
 					ui.same_line()
 				}
 			ui.container_end()
@@ -76,14 +77,14 @@ main :: proc() {
 		for j in 0..<10 {
 			config := button_config
 			config.label = fmt.ctprintf("%d", 70 + j)
-			ui.button(dimensions = {ui.Size_Pixels(64.0), ui.Size_Percentage(0.5)}, config = config)
+			ui.element(.Button, dimensions = {ui.Size_Pixels(64.0), ui.Size_Percentage(0.5)}, config = config)
 			ui.same_line()
 		}
 		ctx.same_line = false
 		for j in 0..<10 {
 			config := button_config
 			config.label = fmt.ctprintf("%d", 80 + j)
-			ui.button(dimensions = {ui.Size_Pixels(64.0), ui.Size_Percentage(0.5)}, config = config)
+			ui.element(.Button, dimensions = {ui.Size_Pixels(64.0), ui.Size_Percentage(0.5)}, config = config)
 			ui.same_line()
 		}
 		ui.container_end()
@@ -92,7 +93,7 @@ main :: proc() {
 			for j in 0..<10 {
 				config := button_config
 				config.label = fmt.ctprintf("%d", 90 + j)
-				ui.button(dimensions = {ui.Size_Percentage(0.1), ui.Size_Percentage(1.0)}, config = config)
+				ui.element(.Button, dimensions = {ui.Size_Percentage(0.1), ui.Size_Percentage(1.0)}, config = config)
 				ui.same_line()
 			}
 		ui.container_end()
@@ -102,7 +103,7 @@ main :: proc() {
 		defer rl.EndDrawing()
 		rl.ClearBackground(rl.BLACK)
 
-		render_ui_elements(&ctx, elements)
+		render_ui_elements(&ctx, &element_focus_id, elements)
 
 		ui.start(&ctx, {0, 0}, {WINDOW_WIDTH, WINDOW_HEIGHT})
 		config := ui.ElementConfiguration{margin = V2_ONE * 4, padding = V2_ONE * 4, color = ui.col(rl.MAGENTA)}
@@ -118,10 +119,10 @@ main :: proc() {
 		debug_elements := ui.end()
 
 		if rl.IsKeyPressed(.TAB) {
-			ui.focus_next_element(&ctx, {.InputFloat})
+			element_focus_id = ui.focus_next_element(element_focus_id, {.InputFloat})
 		}
 
-		render_ui_elements(&ctx, debug_elements)
+		render_ui_elements(&ctx, &element_focus_id, debug_elements)
 	}
 }
 
@@ -131,11 +132,11 @@ ui_slider_2d :: proc(width, height: ui.Size_Percentage, config: ui.ElementConfig
 		data: ^UiElementData_Slider
 		data = new(UiElementData_Slider, allocator)
 		data^ = {value = &value.x, min = min, max = max}
-		ui.slider(dimensions, {margin = config.margin}, data)
+		ui.element(.Slider, dimensions, {margin = config.margin}, data)
 		ui.same_line()
 		data = new(UiElementData_Slider, allocator)
 		data^ = {value = &value.y, min = min, max = max}
-		ui.slider(dimensions, {margin = config.margin}, data)
+		ui.element(.Slider, dimensions, {margin = config.margin}, data)
 	ui.container_end()
 	return container
 }
@@ -146,20 +147,20 @@ ui_input_float_2d :: proc(width, height: ui.Size_Percentage, config: ui.ElementC
 		data: ^UiElementData_FloatInput
 		data = new(UiElementData_FloatInput, allocator)
 		data^ = {value_string = value_string_x, value = &value.x}
-		ui.input_float(dimensions, {margin = config.margin}, data)
+		ui.element(.InputFloat, dimensions, {margin = config.margin}, data)
 		ui.same_line()
 
 		data = new(UiElementData_FloatInput, allocator)
 		data^ = {value_string = value_string_x, value = &value.x}
-		ui.input_float(dimensions, {margin = config.margin}, data)
+		ui.element(.InputFloat, dimensions, {margin = config.margin}, data)
 	ui.container_end()
 	return container
 }
 
-render_ui_elements :: proc(ctx: ^ui.Context, elements: []ui.Element) {
+render_ui_elements :: proc(ctx: ^ui.Context, focus_element_id: ^ui.ElementId, elements: []ui.Element) {
 	for element in elements {
 		area := rl.Rectangle(element.area)
-		switch element.type {
+		#partial switch element.type {
 		case .Container:
 			dim := rl.Color {0, 0, 0, 192}
 			if element.data != nil {
@@ -191,8 +192,8 @@ render_ui_elements :: proc(ctx: ^ui.Context, elements: []ui.Element) {
 			rl.GuiSlider(area, "", "", data.value, data.min, data.max)
 		case .InputFloat:
 			data := cast(^UiElementData_FloatInput)element.data
-			if rl.GuiValueBoxFloat(area, element.label, data.value_string, data.value, ui.is_element_focused(ctx, element)) == 1 {
-				ui.focus_element(ctx, element)
+			if rl.GuiValueBoxFloat(area, element.label, data.value_string, data.value, element.id == focus_element_id^) == 1 {
+				focus_element_id^ = element.id
 			}
 		}
 	}
diff --git a/ui.odin b/ui.odin
index eebde26..4b3bafa 100644
--- a/ui.odin
+++ b/ui.odin
@@ -18,7 +18,6 @@ ctx: ^Context
 
 Context :: struct {
 	origin: v2,
-	element_focus_id: ElementId,
 	container_count: u16,
 	containers: [dynamic]int,
 	container_last_element: [dynamic]int,
@@ -57,6 +56,17 @@ ElementType :: enum {
 	Button,
 	Slider,
 	InputFloat,
+	Dropdown,
+	Custom0,
+	Custom1,
+	Custom2,
+	Custom3,
+	Custom4,
+	Custom5,
+	Custom6,
+	Custom7,
+	Custom8,
+	Custom9,
 }
 
 @rodata element_type_input := bit_set[ElementType] {.InputFloat}
@@ -109,36 +119,22 @@ same_line :: proc() {
 	ctx.same_line = true
 }
 
-focus_element :: proc(ctx: ^Context, element: Element) {
-	ctx.element_focus_id = element.id
-}
-
-unfocus_element :: proc(ctx: ^Context) {
-	ctx.element_focus_id = element_id_invalid()
-}
-
-is_element_focused :: proc(ctx: ^Context, element: Element) -> bool {
-	return ctx.element_focus_id == element.id
-}
-
-focus_next_element :: proc(ctx: ^Context, allowed_focus := element_type_input) {
-	if ctx.element_focus_id == element_id_invalid() {
-		return
+focus_next_element :: proc(id: ElementId, allowed_focus: bit_set[ElementType]) -> ElementId {
+	if id == element_id_invalid() {
+		return element_id_invalid()
 	}
-	element_index := int(ctx.element_focus_id.element_index)
+	element_index := int(id.element_index)
 	if element_index + 1 >= len(ctx.elements) {
-		ctx.element_focus_id = element_id_invalid()
-		return
+		return element_id_invalid()
 	}
 	element_index += 1
 	for element_index < len(ctx.elements) {
 		if ctx.elements[element_index].type in allowed_focus {
-			ctx.element_focus_id = ctx.elements[element_index].id
-			return
+			return ctx.elements[element_index].id
 		}
 		element_index += 1
 	}
-	ctx.element_focus_id = element_id_invalid()
+	return element_id_invalid()
 }
 
 container_begin :: proc(dimensions: Dimensions, config: ElementConfiguration, data: rawptr = nil) -> ^Element {
@@ -174,7 +170,8 @@ container_end :: proc() {
 	ctx.same_line = false
 }
 
-assert_no_dimensions_percentage_in_auto_container :: proc(dimensions: Dimensions) {
+element :: proc(element_type: ElementType, dimensions: Dimensions, config: ElementConfiguration, data: rawptr = nil) -> ^Element {
+	assert(element_type != .Container)
 	container := _container_current()
 	if _, is_auto := container.dimensions.width.(Size_Auto); is_auto {
 		_, is_pixels := dimensions.width.(Size_Pixels)
@@ -184,24 +181,9 @@ assert_no_dimensions_percentage_in_auto_container :: proc(dimensions: Dimensions
 		_, is_pixels := dimensions.height.(Size_Pixels)
 		assert(is_pixels, "Any height that is not Size_Pixels is disallowed in a container using Size_Auto for height")
 	}
-}
 
-button :: proc(dimensions: Dimensions, config: ElementConfiguration, data: rawptr = nil) -> ^Element {
-	assert_no_dimensions_percentage_in_auto_container(dimensions)
 	area := _resolve_element_area(dimensions, config.margin)
-	return _append_element({area = area, config = config, type = .Button, dimensions = dimensions, data = data})
-}
-
-slider :: proc(dimensions: Dimensions, config: ElementConfiguration, data: rawptr = nil) -> ^Element {
-	assert_no_dimensions_percentage_in_auto_container(dimensions)
-	area := _resolve_element_area(dimensions, config.margin)
-	return _append_element({area = area, config = config, type = .Slider, dimensions = dimensions, data = data})
-}
-
-input_float :: proc(dimensions: Dimensions, config: ElementConfiguration, data: rawptr = nil) -> ^Element {
-	assert_no_dimensions_percentage_in_auto_container(dimensions)
-	area := _resolve_element_area(dimensions, config.margin)
-	return _append_element({area = area, config = config, type = .InputFloat, dimensions = dimensions, data = data})
+	return _append_element({area = area, config = config, type = element_type, dimensions = dimensions, data = data})
 }
 
 get_element_outer_area :: proc(element: Element) -> rect2 {