diff --git a/src/app/gfx/bitmap.h b/src/app/gfx/bitmap.h
index 960be60e..fa8577d7 100644
--- a/src/app/gfx/bitmap.h
+++ b/src/app/gfx/bitmap.h
@@ -22,15 +22,15 @@ namespace app {
  */
 namespace gfx {
 
-constexpr int SNES_PIXELFORMAT_2BPP = SDL_DEFINE_PIXELFORMAT(
+constexpr Uint32 SNES_PIXELFORMAT_2BPP = SDL_DEFINE_PIXELFORMAT(
     /*type=*/SDL_PIXELTYPE_INDEX8, /*order=*/0,
     /*layouts=*/0, /*bits=*/2, /*bytes=*/1);
 
-constexpr int SNES_PIXELFORMAT_4BPP = SDL_DEFINE_PIXELFORMAT(
+constexpr Uint32 SNES_PIXELFORMAT_4BPP = SDL_DEFINE_PIXELFORMAT(
     /*type=*/SDL_PIXELTYPE_INDEX8, /*order=*/0,
     /*layouts=*/0, /*bits=*/4, /*bytes=*/1);
 
-constexpr int SNES_PIXELFORMAT_8BPP = SDL_DEFINE_PIXELFORMAT(
+constexpr Uint32 SNES_PIXELFORMAT_8BPP = SDL_DEFINE_PIXELFORMAT(
     /*type=*/SDL_PIXELTYPE_INDEX8, /*order=*/0,
     /*layouts=*/0, /*bits=*/8, /*bytes=*/1);
 
diff --git a/src/app/gui/asset_browser.cc b/src/app/gui/asset_browser.cc
index fb43b584..856fb5c9 100644
--- a/src/app/gui/asset_browser.cc
+++ b/src/app/gui/asset_browser.cc
@@ -16,13 +16,11 @@ void GfxSheetAssetBrowser::Draw(gfx::BitmapManager* bmp_manager) {
   Checkbox("Allow Sorting", &AllowSorting);
   SameLine();
   Checkbox("Stretch Spacing", &StretchSpacing);
-
-  SeparatorText("Selection Behavior");
+  SameLine();
   Checkbox("Allow dragging unselected item", &AllowDragUnselected);
   SameLine();
   Checkbox("Allow box-selection", &AllowBoxSelect);
-
-  SeparatorText("Layout");
+  SameLine();
   SliderFloat("Icon Size", &IconSize, 16.0f, 128.0f, "%.0f");
   SameLine();
   SliderInt("Icon Spacing", &IconSpacing, 0, 32);
diff --git a/src/lib/imgui b/src/lib/imgui
index d42fa46d..b847c414 160000
--- a/src/lib/imgui
+++ b/src/lib/imgui
@@ -1 +1 @@
-Subproject commit d42fa46dc6b68863046c22467297933dbe39bb55
+Subproject commit b847c414372928b6b919bc93d573adb1ff950c47