diff --git a/genius/GNUmakefile b/genius/GNUmakefile
index ced672cb..c9a14577 100644
--- a/genius/GNUmakefile
+++ b/genius/GNUmakefile
@@ -1,17 +1,22 @@
-build := stable
-include ../nall/GNUmakefile
-include ../hiro/GNUmakefile
-
 name := genius
+build := stable
+
+nall.path := ../nall
+include $(nall.path)/GNUmakefile
+
+object.path := obj
 flags += -I..
 
-objects := obj/hiro.o
-objects += obj/genius.o
-objects += $(if $(call streq,$(platform),windows),obj/resource.o)
+hiro.path := ../hiro
+hiro.resource := data/$(name).rc
+include $(hiro.path)/GNUmakefile
 
-default: information $(objects)
+objects := obj/hiro.o $(if $(call streq,$(platform),windows),obj/hiro-resource.o)
+objects += obj/genius.o
+
+all: $(objects)
 	$(info Linking out/$(name) ...)
-	+@$(strip $(compiler) -o out/$(name) $(objects) $(link) $(hirolink))
+	+@$(strip $(compiler) -o out/$(name) $(objects) $(options) $(hiro.options))
 ifeq ($(platform),macos)
 	rm -rf out/$(name).app
 	mkdir -p out/$(name).app/Contents/MacOS/
@@ -21,17 +26,9 @@ ifeq ($(platform),macos)
 	sips -s format icns data/$(name).png --out out/$(name).app/Contents/Resources/$(name).icns
 endif
 
-obj/hiro.o: ../hiro/hiro.cpp
-	$(info Compiling $< ...)
-	@$(compiler) $(hiroflags) -o obj/hiro.o -c ../hiro/hiro.cpp
-
 obj/genius.o: genius.cpp genius.hpp
 	$(info Compiling $< ...)
-	@$(compiler) $(cppflags) $(flags) -o obj/genius.o -c genius.cpp
-
-obj/resource.o: data/$(name).rc
-	$(info Compiling $< ...)
-	@$(windres) data/$(name).rc obj/resource.o
+	@$(compiler) $(flags.cpp) $(flags) -o obj/genius.o -c genius.cpp
 
 clean:
 ifeq ($(platform),macos)
diff --git a/genius/genius.cpp b/genius/genius.cpp
index 11983347..9fcf4718 100644
--- a/genius/genius.cpp
+++ b/genius/genius.cpp
@@ -42,7 +42,7 @@ ListWindow::ListWindow() {
     }).information();
   });
 
-  layout.setMargin(5);
+  layout.setPadding(5);
   gameList.onActivate([&] { modifyButton.doActivate(); });
   gameList.onChange([&] { updateWindow(); });
   appendButton.setText("Append").onActivate([&] {
@@ -249,7 +249,7 @@ auto ListWindow::removeGame() -> void {
 GameWindow::GameWindow() {
   gameWindow = this;
 
-  layout.setMargin(5);
+  layout.setPadding(5);
   hashLabel.setText("SHA256:").setAlignment(1.0);
   hashEdit.setFont(Font().setFamily(Font::Mono)).onChange([&] { modified = true, updateWindow(); });
   regionLabel.setText("Region:").setAlignment(1.0);
@@ -451,7 +451,7 @@ auto GameWindow::removeComponent() -> void {
 MemoryWindow::MemoryWindow() {
   memoryWindow = this;
 
-  layout.setMargin(5);
+  layout.setPadding(5);
   typeLabel.setText("Type:").setAlignment(1.0);
   typeEdit.append(ComboEditItem().setText("ROM"));
   typeEdit.append(ComboEditItem().setText("EEPROM"));
@@ -554,7 +554,7 @@ auto MemoryWindow::updateWindow() -> void {
 OscillatorWindow::OscillatorWindow() {
   oscillatorWindow = this;
 
-  layout.setMargin(5);
+  layout.setPadding(5);
   frequencyLabel.setText("Frequency:").setAlignment(1.0);
   frequencyEdit.onChange([&] { modified = true, updateWindow(); });
   acceptButton.setText("Accept").onActivate([&] { accept(); });
diff --git a/higan/GNUmakefile b/higan/GNUmakefile
index 6bc45eda..36accab4 100644
--- a/higan/GNUmakefile
+++ b/higan/GNUmakefile
@@ -1,11 +1,13 @@
 build := performance
 openmp := true
-include ../nall/GNUmakefile
+
+nall.path := ../nall
+include $(nall.path)/GNUmakefile
 
 binary := application
 target := bsnes
 objects := libco emulator audio video resource
-
+object.path := obj
 flags += -I. -I..
 
 ifeq ($(platform),windows)
@@ -38,9 +40,9 @@ endif
 compile = \
   $(strip \
     $(if $(filter %.c,$<), \
-      $(compiler) $(cflags)   $(flags) $1 -c $< -o $@ -MMD -MP -MF $(@:.o=.d), \
+      $(compiler) $(flags.c)   $(flags) $1 -c $< -o $@ -MMD -MP -MF $(@:.o=.d), \
     $(if $(filter %.cpp,$<), \
-      $(compiler) $(cppflags) $(flags) $1 -c $< -o $@ -MMD -MP -MF $(@:.o=.d) \
+      $(compiler) $(flags.cpp) $(flags) $1 -c $< -o $@ -MMD -MP -MF $(@:.o=.d) \
     )) \
   )
 
diff --git a/higan/audio/stream.cpp b/higan/audio/stream.cpp
index 7bf23dc2..547db942 100644
--- a/higan/audio/stream.cpp
+++ b/higan/audio/stream.cpp
@@ -50,12 +50,12 @@ auto Stream::pending() const -> bool {
 }
 
 auto Stream::read(double samples[]) -> uint {
-  for(auto c : range(channels)) samples[c] = channels[c].resampler.read();
+  for(auto c : range(channels.size())) samples[c] = channels[c].resampler.read();
   return channels.size();
 }
 
 auto Stream::write(const double samples[]) -> void {
-  for(auto c : range(channels)) {
+  for(auto c : range(channels.size())) {
     double sample = samples[c] + 1e-25;  //constant offset used to suppress denormals
     for(auto& filter : channels[c].filters) {
       switch(filter.order) {
diff --git a/higan/emulator/emulator.hpp b/higan/emulator/emulator.hpp
index 5335d2a9..6ba1a263 100644
--- a/higan/emulator/emulator.hpp
+++ b/higan/emulator/emulator.hpp
@@ -13,7 +13,7 @@ using namespace nall;
 
 namespace Emulator {
   static const string Name    = "higan";
-  static const string Version = "106.46";
+  static const string Version = "106.47";
   static const string Author  = "byuu";
   static const string License = "GPLv3";
   static const string Website = "https://byuu.org/";
diff --git a/higan/processor/v30mz/serialization.cpp b/higan/processor/v30mz/serialization.cpp
index 9551a529..922324db 100644
--- a/higan/processor/v30mz/serialization.cpp
+++ b/higan/processor/v30mz/serialization.cpp
@@ -7,7 +7,7 @@ auto V30MZ::serialize(serializer& s) -> void {
   if(s.mode() == serializer::Save) {
     uint8 _prefixes[7] = {0};
     uint8 _prefixCount = prefixes.size();
-    for(auto n : range(prefixes)) _prefixes[n] = prefixes[n];
+    for(auto n : range(_prefixCount)) _prefixes[n] = prefixes[n];
     s.integer(_prefixCount);
     s.array(_prefixes);
   } else {
@@ -16,7 +16,7 @@ auto V30MZ::serialize(serializer& s) -> void {
     s.integer(_prefixCount);
     s.array(_prefixes);
     prefixes.resize(_prefixCount);
-    for(auto n : range(prefixes)) prefixes[n] = _prefixes[n];
+    for(auto n : range(_prefixCount)) prefixes[n] = _prefixes[n];
   }
 
   s.integer(modrm.mod);
diff --git a/higan/sfc/ppu-fast/object.cpp b/higan/sfc/ppu-fast/object.cpp
index 25bc346f..1d144162 100644
--- a/higan/sfc/ppu-fast/object.cpp
+++ b/higan/sfc/ppu-fast/object.cpp
@@ -38,7 +38,7 @@ auto PPU::Line::renderObject(PPU::IO::Object& self) -> void {
     }
   }
 
-  for(int n : rrange(ppu.ItemLimit)) {
+  for(int n : reverse(range(ppu.ItemLimit))) {
     const auto& item = items[n];
     if(!item.valid) continue;
 
diff --git a/higan/target-bsnes/GNUmakefile b/higan/target-bsnes/GNUmakefile
index 7b525c5b..0176ce2c 100644
--- a/higan/target-bsnes/GNUmakefile
+++ b/higan/target-bsnes/GNUmakefile
@@ -5,13 +5,11 @@ include sfc/GNUmakefile
 include gb/GNUmakefile
 include processor/GNUmakefile
 
-objects := ruby hiro $(objects)
+objects := ruby hiro $(if $(call streq,$(platform),windows),hiro-resource) $(objects)
 objects += ui-bsnes ui-program ui-input ui-presentation
 objects += ui-settings ui-tools ui-resource
-objects += $(if $(call streq,$(platform),windows),ui-windows)
 objects := $(objects:%=obj/%.o)
 
-# platform
 ifeq ($(platform),windows)
   ruby += video.wgl video.direct3d video.directdraw video.gdi
   ruby += audio.asio audio.wasapi audio.xaudio2 audio.directsound
@@ -30,23 +28,13 @@ else ifeq ($(platform),bsd)
   ruby += input.sdl input.xlib
 endif
 
-# ruby
-include ../ruby/GNUmakefile
-link += $(rubylink)
+ruby.path := ../ruby
+include $(ruby.path)/GNUmakefile
 
-obj/ruby.o: ../ruby/ruby.cpp $(call rwildcard,../ruby/)
-	$(info Compiling $< ...)
-	@$(compiler) $(rubyflags) -c $< -o $@
+hiro.path := ../hiro
+hiro.resource := $(ui)/resource/bsnes.rc
+include $(hiro.path)/GNUmakefile
 
-# hiro
-include ../hiro/GNUmakefile
-link += $(hirolink)
-
-obj/hiro.o: ../hiro/hiro.cpp $(call rwildcard,../hiro/)
-	$(info Compiling $< ...)
-	@$(compiler) $(hiroflags) -c $< -o $@
-
-# rules
 obj/ui-bsnes.o: $(ui)/bsnes.cpp
 obj/ui-program.o: $(ui)/program/program.cpp
 obj/ui-input.o: $(ui)/input/input.cpp
@@ -55,14 +43,10 @@ obj/ui-settings.o: $(ui)/settings/settings.cpp
 obj/ui-tools.o: $(ui)/tools/tools.cpp
 obj/ui-resource.o: $(ui)/resource/resource.cpp
 
-obj/ui-windows.o: $(ui)/resource/bsnes.rc
-	$(info Compiling $< ...)
-	@$(windres) $(ui)/resource/bsnes.rc obj/ui-windows.o
-
 # targets
-default: information $(objects)
+all: $(objects)
 	$(info Linking out/$(name) ...)
-	+@$(strip $(compiler) -o out/$(name) $(objects) $(link))
+	+@$(strip $(compiler) -o out/$(name) $(objects) $(options) $(ruby.options) $(hiro.options))
 ifeq ($(platform),macos)
 	rm -rf out/$(name).app
 	mkdir -p out/$(name).app/Contents/MacOS/
@@ -84,7 +68,9 @@ else ifneq ($(filter $(platform),linux bsd),)
 	mkdir -p $(prefix)/share/applications/
 	mkdir -p $(prefix)/share/icons/
 	mkdir -p $(prefix)/share/$(name)/
+	mkdir -p $(prefix)/share/$(name)/locales/
 	cp out/$(name) $(prefix)/bin/$(name)
+	cp $(ui)/resource/locales/* $(prefix)/share/$(name)/locales/
 	cp $(ui)/resource/$(name).desktop $(prefix)/share/applications/$(name).desktop
 	cp $(ui)/resource/$(name).png $(prefix)/share/icons/$(name).png
 endif
diff --git a/higan/target-bsnes/bsnes.cpp b/higan/target-bsnes/bsnes.cpp
index 665ca7ce..c09a3892 100644
--- a/higan/target-bsnes/bsnes.cpp
+++ b/higan/target-bsnes/bsnes.cpp
@@ -4,6 +4,7 @@ unique_pointer<Video> video;
 unique_pointer<Audio> audio;
 unique_pointer<Input> input;
 unique_pointer<Emulator::Interface> emulator;
+Locale ns;
 
 auto locate(string name) -> string {
   string location = {Path::program(), name};
@@ -19,9 +20,16 @@ auto locate(string name) -> string {
 }
 
 #include <nall/main.hpp>
-auto nall::main(string_vector args) -> void {
+auto nall::main(string_vector arguments) -> void {
+  ns.scan(locate("locales/"));
+  ns.select("日本語");
+  for(auto argument : arguments) {
+    if(argument.beginsWith("--locale=")) {
+      ns.select(argument.trimLeft("--locale=", 1L));
+    }
+  }
   Application::setName("bsnes");
   emulator = new SuperFamicom::Interface;
-  new Program(args);
+  new Program(arguments);
   Application::run();
 }
diff --git a/higan/target-bsnes/bsnes.hpp b/higan/target-bsnes/bsnes.hpp
index 68f769db..cf3b5911 100644
--- a/higan/target-bsnes/bsnes.hpp
+++ b/higan/target-bsnes/bsnes.hpp
@@ -11,6 +11,7 @@ extern unique_pointer<Input> input;
 #include <emulator/emulator.hpp>
 extern unique_pointer<Emulator::Interface> emulator;
 
+extern Locale ns;
 #include "program/program.hpp"
 #include "input/input.hpp"
 #include "presentation/presentation.hpp"
diff --git a/higan/target-bsnes/input/input.cpp b/higan/target-bsnes/input/input.cpp
index 9d1d2542..a86f9acc 100644
--- a/higan/target-bsnes/input/input.cpp
+++ b/higan/target-bsnes/input/input.cpp
@@ -231,7 +231,7 @@ auto InputManager::poll() -> void {
   auto devices = input->poll();
   bool changed = devices.size() != this->devices.size();
   if(!changed) {
-    for(auto n : range(devices)) {
+    for(auto n : range(devices.size())) {
       changed = devices[n] != this->devices[n];
       if(changed) break;
     }
diff --git a/higan/target-bsnes/presentation/about.cpp b/higan/target-bsnes/presentation/about.cpp
index e5a250dc..522de7db 100644
--- a/higan/target-bsnes/presentation/about.cpp
+++ b/higan/target-bsnes/presentation/about.cpp
@@ -1,24 +1,23 @@
-AboutWindow::AboutWindow() {
+AboutWindow::AboutWindow() : Locale::Namespace(ns, "About") {
   aboutWindow = this;
 
-  setTitle("About bsnes ...");
+  setTitle(tr("About {0} ...", "bsnes"));
   setBackgroundColor({255, 255, 240});
-  layout.setMargin(10);
+  layout.setPadding(10);
   auto logo = image{Resource::Logo};
   logo.alphaBlend(0xfffff0);
   canvas.setIcon(logo);
-  informationLeft.setFont(Font().setBold()).setAlignment(1.0).setText({
-    "Version:\n",
-    "Author:\n",
-    "License:\n",
-    "Website:"
-  });
-  informationRight.setFont(Font().setBold()).setAlignment(0.0).setText({
-    Emulator::Version, "\n",
-    Emulator::Author, "\n",
-    Emulator::License, "\n",
-    Emulator::Website
-  });
+  tableLayout.setFont(Font().setBold());
+  tableLayout.setSize({2, 4});
+  tableLayout.column(0).setSpacing(3);
+  versionLabel.setText(tr("Version:")).setAlignment(1.0);
+  versionValue.setText(Emulator::Version);
+  authorLabel.setText(tr("Author:")).setAlignment(1.0);
+  authorValue.setText(Emulator::Author);
+  licenseLabel.setText(tr("License:")).setAlignment(1.0);
+  licenseValue.setText(Emulator::License);
+  websiteLabel.setText(tr("Website:")).setAlignment(1.0);
+  websiteValue.setText(Emulator::Website);
 
   setResizable(false);
   setSize(layout.minimumSize());
diff --git a/higan/target-bsnes/presentation/presentation.cpp b/higan/target-bsnes/presentation/presentation.cpp
index 7e2e4083..f1d828f9 100644
--- a/higan/target-bsnes/presentation/presentation.cpp
+++ b/higan/target-bsnes/presentation/presentation.cpp
@@ -3,10 +3,10 @@
 unique_pointer<AboutWindow> aboutWindow;
 unique_pointer<Presentation> presentation;
 
-Presentation::Presentation() {
+Presentation::Presentation() : Locale::Namespace(ns, "Presentation") {
   presentation = this;
 
-  systemMenu.setText("System");
+  systemMenu.setText(tr("System"));
   loadGame.setIcon(Icon::Action::Open).setText("Load Game ...").onActivate([&] {
     program->load();
   });
@@ -55,7 +55,7 @@ Presentation::Presentation() {
   }
   quit.setIcon(Icon::Action::Quit).setText("Quit").onActivate([&] { program->quit(); });
 
-  settingsMenu.setText("Settings");
+  settingsMenu.setText(tr("Settings"));
   sizeMenu.setIcon(Icon::Emblem::Image).setText("Size");
   updateSizeMenu();
   outputMenu.setIcon(Icon::Emblem::Image).setText("Output");
@@ -115,7 +115,7 @@ Presentation::Presentation() {
   pathSettings.setIcon(Icon::Emblem::Folder).setText("Paths ...").onActivate([&] { settingsWindow->show(4); });
   advancedSettings.setIcon(Icon::Action::Settings).setText("Advanced ...").onActivate([&] { settingsWindow->show(5); });
 
-  toolsMenu.setText("Tools").setVisible(false);
+  toolsMenu.setText(tr("Tools")).setVisible(false);
   saveState.setIcon(Icon::Action::Save).setText("Save State");
   for(uint index : range(QuickStates)) {
     saveState.append(MenuItem().setText({"Slot ", 1 + index}).onActivate([=] {
@@ -152,7 +152,7 @@ Presentation::Presentation() {
   stateManager.setIcon(Icon::Application::FileManager).setText("State Manager ...").onActivate([&] { toolsWindow->show(1); });
   manifestViewer.setIcon(Icon::Emblem::Text).setText("Manifest Viewer ...").onActivate([&] { toolsWindow->show(2); });
 
-  helpMenu.setText("Help");
+  helpMenu.setText(tr("Help"));
   documentation.setIcon(Icon::Application::Browser).setText("Documentation ...").onActivate([&] {
     invoke("https://doc.byuu.org/bsnes/");
   });
@@ -469,7 +469,7 @@ auto Presentation::addRecentGame(string location) -> void {
   for(uint index : range(RecentGames + 1)) {
     auto value = settings[{"Game/Recent/", 1 + index}].text();
     if(!value || value == location) {
-      for(uint n : rrange(index + 1)) {
+      for(uint n : reverse(range(index + 1))) {
         if(1 + n > RecentGames) continue;
         settings({"Game/Recent/", 1 + n}).setValue(settings[{"Game/Recent/", n}].text());
       }
diff --git a/higan/target-bsnes/presentation/presentation.hpp b/higan/target-bsnes/presentation/presentation.hpp
index c13147ae..68515c98 100644
--- a/higan/target-bsnes/presentation/presentation.hpp
+++ b/higan/target-bsnes/presentation/presentation.hpp
@@ -1,14 +1,23 @@
-struct AboutWindow : Window {
+struct AboutWindow : Locale::Namespace, Window {
   AboutWindow();
 
   VerticalLayout layout{this};
     Canvas canvas{&layout, Size{400, 85}, 0};
-    HorizontalLayout informationLayout{&layout, Size{~0, ~0}};
-      Label informationLeft{&informationLayout, Size{~0, 0}, 3};
-      Label informationRight{&informationLayout, Size{~0, 0}};
+    TableLayout tableLayout{&layout, Size{~0, 0}};
+      Label versionLabel{&tableLayout, Size{~0, 0}};
+      Label versionValue{&tableLayout, Size{~0, 0}};
+    //
+      Label authorLabel{&tableLayout, Size{~0, 0}};
+      Label authorValue{&tableLayout, Size{~0, 0}};
+    //
+      Label licenseLabel{&tableLayout, Size{~0, 0}};
+      Label licenseValue{&tableLayout, Size{~0, 0}};
+    //
+      Label websiteLabel{&tableLayout, Size{~0, 0}};
+      Label websiteValue{&tableLayout, Size{~0, 0}};
 };
 
-struct Presentation : Window {
+struct Presentation : Locale::Namespace, Window {
   enum : uint { RecentGames = 9, QuickStates = 9 };
   enum : uint { StatusHeight = 24 };
 
diff --git a/higan/target-bsnes/program/program.cpp b/higan/target-bsnes/program/program.cpp
index edb96dc0..1565a78d 100644
--- a/higan/target-bsnes/program/program.cpp
+++ b/higan/target-bsnes/program/program.cpp
@@ -13,7 +13,7 @@
 #include "hacks.cpp"
 unique_pointer<Program> program;
 
-Program::Program(string_vector arguments) {
+Program::Program(string_vector arguments) : Locale::Namespace(ns, "Program") {
   program = this;
   Emulator::platform = this;
 
diff --git a/higan/target-bsnes/program/program.hpp b/higan/target-bsnes/program/program.hpp
index 0c9bd02e..510254fe 100644
--- a/higan/target-bsnes/program/program.hpp
+++ b/higan/target-bsnes/program/program.hpp
@@ -1,4 +1,4 @@
-struct Program : Emulator::Platform {
+struct Program : Locale::Namespace, Emulator::Platform {
   //program.cpp
   Program(string_vector arguments);
   auto main() -> void;
diff --git a/higan/target-bsnes/program/utility.cpp b/higan/target-bsnes/program/utility.cpp
index 01d2e399..1d97af3e 100644
--- a/higan/target-bsnes/program/utility.cpp
+++ b/higan/target-bsnes/program/utility.cpp
@@ -18,11 +18,11 @@ auto Program::updateStatus() -> void {
 
   string frameRate;
   if(!emulator->loaded()) {
-    frameRate = "Unloaded";
+    frameRate = tr("Unloaded");
   } else if(presentation->pauseEmulation.checked()) {
-    frameRate = "Paused";
+    frameRate = tr("Paused");
   } else if(!focused() && settingsWindow->input.pauseEmulation.checked()) {
-    frameRate = "Paused";
+    frameRate = tr("Paused");
   } else {
     frameRate = statusFrameRate;
   }
diff --git a/higan/target-bsnes/resource/locales/japanese.bml b/higan/target-bsnes/resource/locales/japanese.bml
new file mode 100644
index 00000000..6619dde7
--- /dev/null
+++ b/higan/target-bsnes/resource/locales/japanese.bml
@@ -0,0 +1,40 @@
+locale
+  language: 日本語
+
+namespace: Program
+  map
+    input: Paused
+    value: ポーズ
+
+namespace: Presentation
+  map
+    input: System
+    value: システム
+  map
+    input: Settings
+    value: 設定
+  map
+    input: Tools
+    value: ツール
+  map
+    input: Help
+    value: ヘルプ
+
+namespace: About
+  map
+    input: About {0} ...
+    value: {0}について ...
+
+  map
+    input: Version:
+    value: バージョン:
+  map
+    input: Author:
+    value: 作者:
+  map
+    input: License:
+    value: ライセンス:
+  map
+    input: Website:
+    value: 公式サイト:
+
diff --git a/higan/target-bsnes/settings/advanced.cpp b/higan/target-bsnes/settings/advanced.cpp
index ecf01bf4..89ac2029 100644
--- a/higan/target-bsnes/settings/advanced.cpp
+++ b/higan/target-bsnes/settings/advanced.cpp
@@ -2,7 +2,7 @@ AdvancedSettings::AdvancedSettings(TabFrame* parent) : TabFrameItem(parent) {
   setIcon(Icon::Action::Settings);
   setText("Advanced");
 
-  layout.setMargin(5);
+  layout.setPadding(5);
   driversLabel.setText("Drivers").setFont(Font().setBold());
 
   videoDriverLabel.setText("Video:");
diff --git a/higan/target-bsnes/settings/audio.cpp b/higan/target-bsnes/settings/audio.cpp
index b3fc45fd..35c7450c 100644
--- a/higan/target-bsnes/settings/audio.cpp
+++ b/higan/target-bsnes/settings/audio.cpp
@@ -2,7 +2,7 @@ AudioSettings::AudioSettings(TabFrame* parent) : TabFrameItem(parent) {
   setIcon(Icon::Device::Speaker);
   setText("Audio");
 
-  layout.setMargin(5);
+  layout.setPadding(5);
 
   driverLabel.setFont(Font().setBold()).setText("Driver");
   deviceLabel.setText("Device:");
@@ -26,7 +26,9 @@ AudioSettings::AudioSettings(TabFrame* parent) : TabFrameItem(parent) {
   });
 
   effectsLabel.setFont(Font().setBold()).setText("Effects");
-  skewLabel.setAlignment(1.0).setText("Skew:");
+  effectsLayout.setSize({3, 3});
+  effectsLayout.column(0).setAlignment(1.0);
+  skewLabel.setText("Skew:");
   skewValue.setAlignment(0.5);
   skewSlider.setLength(10001).setPosition(settings["Audio/Skew"].integer() + 5000).onChange([&] {
     string value = {skewSlider.position() > 5000 ? "+" : "", (int)skewSlider.position() - 5000};
@@ -34,7 +36,7 @@ AudioSettings::AudioSettings(TabFrame* parent) : TabFrameItem(parent) {
     skewValue.setText(value);
     program->updateAudioFrequency();
   }).doChange();
-  volumeLabel.setAlignment(1.0).setText("Volume:");
+  volumeLabel.setText("Volume:");
   volumeValue.setAlignment(0.5);
   volumeSlider.setLength(201).setPosition(settings["Audio/Volume"].natural()).onChange([&] {
     string value = {volumeSlider.position(), "%"};
@@ -42,7 +44,7 @@ AudioSettings::AudioSettings(TabFrame* parent) : TabFrameItem(parent) {
     volumeValue.setText(value);
     program->updateAudioEffects();
   }).doChange();
-  balanceLabel.setAlignment(1.0).setText("Balance:");
+  balanceLabel.setText("Balance:");
   balanceValue.setAlignment(0.5);
   balanceSlider.setLength(101).setPosition(settings["Audio/Balance"].natural()).onChange([&] {
     string value = {balanceSlider.position(), "%"};
diff --git a/higan/target-bsnes/settings/hotkeys.cpp b/higan/target-bsnes/settings/hotkeys.cpp
index 63b53fe2..810eb7ae 100644
--- a/higan/target-bsnes/settings/hotkeys.cpp
+++ b/higan/target-bsnes/settings/hotkeys.cpp
@@ -2,7 +2,7 @@ HotkeySettings::HotkeySettings(TabFrame* parent) : TabFrameItem(parent) {
   setIcon(Icon::Device::Keyboard);
   setText("Hotkeys");
 
-  layout.setMargin(5);
+  layout.setPadding(5);
   mappingList.setBatchable();
   mappingList.onActivate([&] {
     if(assignButton.enabled()) assignButton.doActivate();
diff --git a/higan/target-bsnes/settings/input.cpp b/higan/target-bsnes/settings/input.cpp
index 869389ef..caee9150 100644
--- a/higan/target-bsnes/settings/input.cpp
+++ b/higan/target-bsnes/settings/input.cpp
@@ -2,7 +2,7 @@ InputSettings::InputSettings(TabFrame* parent) : TabFrameItem(parent) {
   setIcon(Icon::Device::Joypad);
   setText("Input");
 
-  layout.setMargin(5);
+  layout.setPadding(5);
   defocusLabel.setText("When focus is lost:");
   pauseEmulation.setText("Pause emulation").onActivate([&] {
     settings["Input/Defocus"].setValue("Pause");
diff --git a/higan/target-bsnes/settings/paths.cpp b/higan/target-bsnes/settings/paths.cpp
index 7c15f7cd..621ce651 100644
--- a/higan/target-bsnes/settings/paths.cpp
+++ b/higan/target-bsnes/settings/paths.cpp
@@ -2,9 +2,11 @@ PathSettings::PathSettings(TabFrame* parent) : TabFrameItem(parent) {
   setIcon(Icon::Emblem::Folder);
   setText("Paths");
 
-  layout.setMargin(5);
+  layout.setPadding(5);
+  layout.setSize({4, 6});
+  layout.column(0).setAlignment(1.0);
 
-  gamesLabel.setAlignment(1.0).setText("Games:");
+  gamesLabel.setText("Games:");
   gamesPath.setEditable(false);
   gamesAssign.setText("Assign ...").onActivate([&] {
     if(auto location = BrowserDialog().setParent(*settingsWindow).selectFolder()) {
@@ -17,7 +19,7 @@ PathSettings::PathSettings(TabFrame* parent) : TabFrameItem(parent) {
     refreshPaths();
   });
 
-  patchesLabel.setAlignment(1.0).setText("Patches:");
+  patchesLabel.setText("Patches:");
   patchesPath.setEditable(false);
   patchesAssign.setText("Assign ...").onActivate([&] {
     if(auto location = BrowserDialog().setParent(*settingsWindow).selectFolder()) {
@@ -30,7 +32,7 @@ PathSettings::PathSettings(TabFrame* parent) : TabFrameItem(parent) {
     refreshPaths();
   });
 
-  savesLabel.setAlignment(1.0).setText("Saves:");
+  savesLabel.setText("Saves:");
   savesPath.setEditable(false);
   savesAssign.setText("Assign ...").onActivate([&] {
     if(auto location = BrowserDialog().setParent(*settingsWindow).selectFolder()) {
@@ -43,7 +45,7 @@ PathSettings::PathSettings(TabFrame* parent) : TabFrameItem(parent) {
     refreshPaths();
   });
 
-  cheatsLabel.setAlignment(1.0).setText("Cheats:");
+  cheatsLabel.setText("Cheats:");
   cheatsPath.setEditable(false);
   cheatsAssign.setText("Assign ...").onActivate([&] {
     if(auto location = BrowserDialog().setParent(*settingsWindow).selectFolder()) {
@@ -56,7 +58,7 @@ PathSettings::PathSettings(TabFrame* parent) : TabFrameItem(parent) {
     refreshPaths();
   });
 
-  statesLabel.setAlignment(1.0).setText("States:");
+  statesLabel.setText("States:");
   statesPath.setEditable(false);
   statesAssign.setText("Assign ...").onActivate([&] {
     if(auto location = BrowserDialog().setParent(*settingsWindow).selectFolder()) {
@@ -69,7 +71,7 @@ PathSettings::PathSettings(TabFrame* parent) : TabFrameItem(parent) {
     refreshPaths();
   });
 
-  screenshotsLabel.setAlignment(1.0).setText("Screenshots:");
+  screenshotsLabel.setText("Screenshots:");
   screenshotsPath.setEditable(false);
   screenshotsAssign.setText("Assign ...").onActivate([&] {
     if(auto location = BrowserDialog().setParent(*settingsWindow).selectFolder()) {
diff --git a/higan/target-bsnes/settings/settings.cpp b/higan/target-bsnes/settings/settings.cpp
index 8e80187c..0157c336 100644
--- a/higan/target-bsnes/settings/settings.cpp
+++ b/higan/target-bsnes/settings/settings.cpp
@@ -82,7 +82,7 @@ auto Settings::save() -> void {
 SettingsWindow::SettingsWindow() {
   settingsWindow = this;
 
-  layout.setMargin(5);
+  layout.setPadding(5);
   statusBar.setFont(Font().setBold());
 
   setTitle("Settings");
diff --git a/higan/target-bsnes/settings/settings.hpp b/higan/target-bsnes/settings/settings.hpp
index 645b12e2..e8d595de 100644
--- a/higan/target-bsnes/settings/settings.hpp
+++ b/higan/target-bsnes/settings/settings.hpp
@@ -9,18 +9,18 @@ struct VideoSettings : TabFrameItem {
 public:
   VerticalLayout layout{this};
     Label colorAdjustmentLabel{&layout, Size{~0, 0}, 2};
-    HorizontalLayout luminanceLayout{&layout, Size{~0, 0}};
-      Label luminanceLabel{&luminanceLayout, Size{65, 0}};
-      Label luminanceValue{&luminanceLayout, Size{50, 0}};
-      HorizontalSlider luminanceSlider{&luminanceLayout, Size{~0, 0}};
-    HorizontalLayout saturationLayout{&layout, Size{~0, 0}};
-      Label saturationLabel{&saturationLayout, Size{65, 0}};
-      Label saturationValue{&saturationLayout, Size{50, 0}};
-      HorizontalSlider saturationSlider{&saturationLayout, Size{~0, 0}};
-    HorizontalLayout gammaLayout{&layout, Size{~0, 0}};
-      Label gammaLabel{&gammaLayout, Size{65, 0}};
-      Label gammaValue{&gammaLayout, Size{50, 0}};
-      HorizontalSlider gammaSlider{&gammaLayout, Size{~0, 0}};
+    TableLayout colorLayout{&layout, Size{~0, 0}};
+      Label luminanceLabel{&colorLayout, Size{0, 0}};
+      Label luminanceValue{&colorLayout, Size{50, 0}};
+      HorizontalSlider luminanceSlider{&colorLayout, Size{~0, 0}};
+    //
+      Label saturationLabel{&colorLayout, Size{0, 0}};
+      Label saturationValue{&colorLayout, Size{50, 0}};
+      HorizontalSlider saturationSlider{&colorLayout, Size{~0, 0}};
+    //
+      Label gammaLabel{&colorLayout, Size{0, 0}};
+      Label gammaValue{&colorLayout, Size{50, 0}};
+      HorizontalSlider gammaSlider{&colorLayout, Size{~0, 0}};
     Label fullscreenLabel{&layout, Size{~0, 0}, 2};
     CheckLabel exclusiveMode{&layout, Size{~0, 0}};
 };
@@ -43,18 +43,18 @@ public:
       ComboButton latencyList{&driverLayout, Size{80, 0}};
     CheckLabel exclusiveMode{&layout, Size{~0, 0}};
     Label effectsLabel{&layout, Size{~0, 0}, 2};
-    HorizontalLayout skewLayout{&layout, Size{~0, 0}};
-      Label skewLabel{&skewLayout, Size{65, 0}};
-      Label skewValue{&skewLayout, Size{50, 0}};
-      HorizontalSlider skewSlider{&skewLayout, Size{~0, 0}};
-    HorizontalLayout volumeLayout{&layout, Size{~0, 0}};
-      Label volumeLabel{&volumeLayout, Size{65, 0}};
-      Label volumeValue{&volumeLayout, Size{50, 0}};
-      HorizontalSlider volumeSlider{&volumeLayout, Size{~0, 0}};
-    HorizontalLayout balanceLayout{&layout, Size{~0, 0}};
-      Label balanceLabel{&balanceLayout, Size{65, 0}};
-      Label balanceValue{&balanceLayout, Size{50, 0}};
-      HorizontalSlider balanceSlider{&balanceLayout, Size{~0, 0}};
+    TableLayout effectsLayout{&layout, Size{~0, 0}};
+      Label skewLabel{&effectsLayout, Size{0, 0}};
+      Label skewValue{&effectsLayout, Size{50, 0}};
+      HorizontalSlider skewSlider{&effectsLayout, Size{~0, 0}};
+    //
+      Label volumeLabel{&effectsLayout, Size{0, 0}};
+      Label volumeValue{&effectsLayout, Size{50, 0}};
+      HorizontalSlider volumeSlider{&effectsLayout, Size{~0, 0}};
+    //
+      Label balanceLabel{&effectsLayout, Size{0, 0}};
+      Label balanceValue{&effectsLayout, Size{50, 0}};
+      HorizontalSlider balanceSlider{&effectsLayout, Size{~0, 0}};
     CheckLabel reverb{&layout, Size{~0, 0}};
 };
 
@@ -121,37 +121,36 @@ struct PathSettings : TabFrameItem {
   auto refreshPaths() -> void;
 
 public:
-  VerticalLayout layout{this};
-    HorizontalLayout gamesLayout{&layout, Size{~0, 0}};
-      Label gamesLabel{&gamesLayout, Size{80, 0}};
-      LineEdit gamesPath{&gamesLayout, Size{~0, 0}};
-      Button gamesAssign{&gamesLayout, Size{80, 0}};
-      Button gamesReset{&gamesLayout, Size{80, 0}};
-    HorizontalLayout patchesLayout{&layout, Size{~0, 0}};
-      Label patchesLabel{&patchesLayout, Size{80, 0}};
-      LineEdit patchesPath{&patchesLayout, Size{~0, 0}};
-      Button patchesAssign{&patchesLayout, Size{80, 0}};
-      Button patchesReset{&patchesLayout, Size{80, 0}};
-    HorizontalLayout savesLayout{&layout, Size{~0, 0}};
-      Label savesLabel{&savesLayout, Size{80, 0}};
-      LineEdit savesPath{&savesLayout, Size{~0, 0}};
-      Button savesAssign{&savesLayout, Size{80, 0}};
-      Button savesReset{&savesLayout, Size{80, 0}};
-    HorizontalLayout cheatsLayout{&layout, Size{~0, 0}};
-      Label cheatsLabel{&cheatsLayout, Size{80, 0}};
-      LineEdit cheatsPath{&cheatsLayout, Size{~0, 0}};
-      Button cheatsAssign{&cheatsLayout, Size{80, 0}};
-      Button cheatsReset{&cheatsLayout, Size{80, 0}};
-    HorizontalLayout statesLayout{&layout, Size{~0, 0}};
-      Label statesLabel{&statesLayout, Size{80, 0}};
-      LineEdit statesPath{&statesLayout, Size{~0, 0}};
-      Button statesAssign{&statesLayout, Size{80, 0}};
-      Button statesReset{&statesLayout, Size{80, 0}};
-    HorizontalLayout screenshotsLayout{&layout, Size{~0, 0}};
-      Label screenshotsLabel{&screenshotsLayout, Size{80, 0}};
-      LineEdit screenshotsPath{&screenshotsLayout, Size{~0, 0}};
-      Button screenshotsAssign{&screenshotsLayout, Size{80, 0}};
-      Button screenshotsReset{&screenshotsLayout, Size{80, 0}};
+  TableLayout layout{this};
+    Label gamesLabel{&layout, Size{0, 0}};
+    LineEdit gamesPath{&layout, Size{~0, 0}};
+    Button gamesAssign{&layout, Size{80, 0}};
+    Button gamesReset{&layout, Size{80, 0}};
+  //
+    Label patchesLabel{&layout, Size{0, 0}};
+    LineEdit patchesPath{&layout, Size{~0, 0}};
+    Button patchesAssign{&layout, Size{80, 0}};
+    Button patchesReset{&layout, Size{80, 0}};
+  //
+    Label savesLabel{&layout, Size{0, 0}};
+    LineEdit savesPath{&layout, Size{~0, 0}};
+    Button savesAssign{&layout, Size{80, 0}};
+    Button savesReset{&layout, Size{80, 0}};
+  //
+    Label cheatsLabel{&layout, Size{0, 0}};
+    LineEdit cheatsPath{&layout, Size{~0, 0}};
+    Button cheatsAssign{&layout, Size{80, 0}};
+    Button cheatsReset{&layout, Size{80, 0}};
+  //
+    Label statesLabel{&layout, Size{0, 0}};
+    LineEdit statesPath{&layout, Size{~0, 0}};
+    Button statesAssign{&layout, Size{80, 0}};
+    Button statesReset{&layout, Size{80, 0}};
+  //
+    Label screenshotsLabel{&layout, Size{0, 0}};
+    LineEdit screenshotsPath{&layout, Size{~0, 0}};
+    Button screenshotsAssign{&layout, Size{80, 0}};
+    Button screenshotsReset{&layout, Size{80, 0}};
 };
 
 struct AdvancedSettings : TabFrameItem {
diff --git a/higan/target-bsnes/settings/video.cpp b/higan/target-bsnes/settings/video.cpp
index e6b86eb7..d5b93953 100644
--- a/higan/target-bsnes/settings/video.cpp
+++ b/higan/target-bsnes/settings/video.cpp
@@ -2,10 +2,12 @@ VideoSettings::VideoSettings(TabFrame* parent) : TabFrameItem(parent) {
   setIcon(Icon::Device::Display);
   setText("Video");
 
-  layout.setMargin(5);
+  layout.setPadding(5);
 
   colorAdjustmentLabel.setFont(Font().setBold()).setText("Color Adjustment");
-  luminanceLabel.setAlignment(1.0).setText("Luminance:");
+  colorLayout.setSize({3, 3});
+  colorLayout.column(0).setAlignment(1.0);
+  luminanceLabel.setText("Luminance:");
   luminanceValue.setAlignment(0.5);
   luminanceSlider.setLength(101).setPosition(settings["Video/Luminance"].natural()).onChange([&] {
     string value = {luminanceSlider.position(), "%"};
@@ -13,7 +15,7 @@ VideoSettings::VideoSettings(TabFrame* parent) : TabFrameItem(parent) {
     luminanceValue.setText(value);
     program->updateVideoPalette();
   }).doChange();
-  saturationLabel.setAlignment(1.0).setText("Saturation:");
+  saturationLabel.setText("Saturation:");
   saturationValue.setAlignment(0.5);
   saturationSlider.setLength(201).setPosition(settings["Video/Saturation"].natural()).onChange([&] {
     string value = {saturationSlider.position(), "%"};
@@ -21,7 +23,7 @@ VideoSettings::VideoSettings(TabFrame* parent) : TabFrameItem(parent) {
     saturationValue.setText(value);
     program->updateVideoPalette();
   }).doChange();
-  gammaLabel.setAlignment(1.0).setText("Gamma:");
+  gammaLabel.setText("Gamma:");
   gammaValue.setAlignment(0.5);
   gammaSlider.setLength(101).setPosition(settings["Video/Gamma"].natural() - 100).onChange([&] {
     string value = {100 + gammaSlider.position(), "%"};
diff --git a/higan/target-bsnes/tools/cheat-editor.cpp b/higan/target-bsnes/tools/cheat-editor.cpp
index f934ac0e..7fc21990 100644
--- a/higan/target-bsnes/tools/cheat-editor.cpp
+++ b/higan/target-bsnes/tools/cheat-editor.cpp
@@ -1,7 +1,7 @@
 CheatDatabase::CheatDatabase() {
   cheatDatabase = this;
 
-  layout.setMargin(5);
+  layout.setPadding(5);
   selectAllButton.setText("Select All").onActivate([&] {
     for(auto item : cheatList.items()) item.setChecked(true);
   });
@@ -55,7 +55,7 @@ auto CheatDatabase::addCheats() -> void {
 CheatWindow::CheatWindow() {
   cheatWindow = this;
 
-  layout.setMargin(5);
+  layout.setPadding(5);
   nameLabel.setText("Name:");
   nameValue.onActivate([&] { if(acceptButton.enabled()) acceptButton.doActivate(); });
   nameValue.onChange([&] { doChange(); });
@@ -106,7 +106,7 @@ CheatEditor::CheatEditor(TabFrame* parent) : TabFrameItem(parent) {
   setIcon(Icon::Edit::Replace);
   setText("Cheat Editor");
 
-  layout.setMargin(5);
+  layout.setPadding(5);
   cheatList.setBatchable();
   cheatList.onActivate([&] {
     editButton.doActivate();
@@ -169,7 +169,7 @@ auto CheatEditor::addCheat(Cheat cheat) -> void {
   cheats.append(cheat);
   cheats.sort();
   refresh();
-  for(uint index : range(cheats)) {
+  for(uint index : range(cheats.size())) {
     if(cheats[index] == cheat) { cheatList.item(index).setSelected(); break; }
   }
   cheatList.doChange();
@@ -181,7 +181,7 @@ auto CheatEditor::editCheat(Cheat cheat) -> void {
     cheats[item.offset()] = cheat;
     cheats.sort();
     refresh();
-    for(uint index : range(cheats)) {
+    for(uint index : range(cheats.size())) {
       if(cheats[index] == cheat) { cheatList.item(index).setSelected(); break; }
     }
     cheatList.doChange();
@@ -193,7 +193,7 @@ auto CheatEditor::removeCheats() -> void {
   if(auto batched = cheatList.batched()) {
     if(MessageDialog("Are you sure you want to permanently remove the selected cheat(s)?")
     .setParent(*toolsWindow).question() == "Yes") {
-      for(uint index : rrange(batched)) cheats.remove(batched[index].offset());
+      for(auto& item : reverse(batched)) cheats.remove(item.offset());
       cheats.sort();
       refresh();
       synchronizeCodes();
diff --git a/higan/target-bsnes/tools/manifest-viewer.cpp b/higan/target-bsnes/tools/manifest-viewer.cpp
index eb788b4c..1b27e52c 100644
--- a/higan/target-bsnes/tools/manifest-viewer.cpp
+++ b/higan/target-bsnes/tools/manifest-viewer.cpp
@@ -2,7 +2,7 @@ ManifestViewer::ManifestViewer(TabFrame* parent) : TabFrameItem(parent) {
   setIcon(Icon::Emblem::Text);
   setText("Manifest Viewer");
 
-  layout.setMargin(5);
+  layout.setPadding(5);
   manifestView.setEditable(false).setWordWrap(false).setFont(Font().setFamily(Font::Mono));
 }
 
diff --git a/higan/target-bsnes/tools/state-manager.cpp b/higan/target-bsnes/tools/state-manager.cpp
index e7d49cb8..55b12573 100644
--- a/higan/target-bsnes/tools/state-manager.cpp
+++ b/higan/target-bsnes/tools/state-manager.cpp
@@ -1,7 +1,7 @@
 StateWindow::StateWindow() {
   stateWindow = this;
 
-  layout.setMargin(5);
+  layout.setPadding(5);
   nameLabel.setText("Name:");
   nameValue.onActivate([&] {
     if(acceptButton.enabled()) acceptButton.doActivate();
@@ -67,7 +67,7 @@ StateManager::StateManager(TabFrame* parent) : TabFrameItem(parent) {
   setIcon(Icon::Application::FileManager);
   setText("State Manager");
 
-  layout.setMargin(5);
+  layout.setPadding(5);
   stateList.setBatchable();
   stateList.onActivate([&] {
     editButton.doActivate();
diff --git a/higan/target-bsnes/tools/tools.cpp b/higan/target-bsnes/tools/tools.cpp
index 7dee36bb..fe6d0d0f 100644
--- a/higan/target-bsnes/tools/tools.cpp
+++ b/higan/target-bsnes/tools/tools.cpp
@@ -10,7 +10,7 @@ unique_pointer<ToolsWindow> toolsWindow;
 ToolsWindow::ToolsWindow() {
   toolsWindow = this;
 
-  layout.setMargin(5);
+  layout.setPadding(5);
 
   setTitle("Tools");
   setSize({600, 400});
diff --git a/higan/target-higan/GNUmakefile b/higan/target-higan/GNUmakefile
index 036db3fb..9234ac05 100644
--- a/higan/target-higan/GNUmakefile
+++ b/higan/target-higan/GNUmakefile
@@ -11,13 +11,11 @@ include gba/GNUmakefile
 include ws/GNUmakefile
 include processor/GNUmakefile
 
-objects := ruby hiro $(objects)
+objects := ruby hiro $(if $(call streq,$(platform),windows),hiro-resource) $(objects)
 objects += ui-higan ui-program ui-input
 objects += ui-settings ui-tools ui-presentation ui-resource
-objects += $(if $(call streq,$(platform),windows),ui-windows)
 objects := $(objects:%=obj/%.o)
 
-# platform
 ifeq ($(platform),windows)
   ruby += video.wgl video.direct3d video.directdraw video.gdi
   ruby += audio.asio audio.wasapi audio.xaudio2 audio.directsound
@@ -36,23 +34,13 @@ else ifeq ($(platform),bsd)
   ruby += input.sdl input.xlib
 endif
 
-# ruby
-include ../ruby/GNUmakefile
-link += $(rubylink)
+ruby.path := ../ruby
+include $(ruby.path)/GNUmakefile
 
-obj/ruby.o: ../ruby/ruby.cpp $(call rwildcard,../ruby/)
-	$(info Compiling $< ...)
-	@$(compiler) $(rubyflags) -c $< -o $@
+hiro.path := ../hiro
+hiro.resource := $(ui)/resource/higan.rc
+include $(hiro.path)/GNUmakefile
 
-# hiro
-include ../hiro/GNUmakefile
-link += $(hirolink)
-
-obj/hiro.o: ../hiro/hiro.cpp $(call rwildcard,../hiro/)
-	$(info Compiling $< ...)
-	@$(compiler) $(hiroflags) -c $< -o $@
-
-# rules
 obj/ui-higan.o: $(ui)/higan.cpp
 obj/ui-program.o: $(ui)/program/program.cpp
 obj/ui-input.o: $(ui)/input/input.cpp
@@ -61,14 +49,10 @@ obj/ui-tools.o: $(ui)/tools/tools.cpp
 obj/ui-presentation.o: $(ui)/presentation/presentation.cpp
 obj/ui-resource.o: $(ui)/resource/resource.cpp
 
-obj/ui-windows.o: $(ui)/resource/higan.rc
-	$(info Compiling $< ...)
-	@$(windres) $(ui)/resource/higan.rc obj/ui-windows.o
-
 # targets
-default: information $(objects)
+all: $(objects)
 	$(info Linking out/$(name) ...)
-	+@$(strip $(compiler) -o out/$(name) $(objects) $(link))
+	+@$(strip $(compiler) -o out/$(name) $(objects) $(options) $(ruby.options) $(hiro.options))
 ifeq ($(platform),macos)
 	rm -rf out/$(name).app
 	mkdir -p out/$(name).app/Contents/MacOS/
diff --git a/higan/target-higan/input/input.cpp b/higan/target-higan/input/input.cpp
index ba1127a8..ec4bba0c 100644
--- a/higan/target-higan/input/input.cpp
+++ b/higan/target-higan/input/input.cpp
@@ -255,7 +255,7 @@ auto InputManager::poll() -> void {
   auto devices = input->poll();
   bool changed = devices.size() != this->devices.size();
   if(!changed) {
-    for(auto n : range(devices)) {
+    for(auto n : range(devices.size())) {
       changed = devices[n] != this->devices[n];
       if(changed) break;
     }
diff --git a/higan/target-higan/presentation/about.cpp b/higan/target-higan/presentation/about.cpp
index 2ebd6af8..1bc59429 100644
--- a/higan/target-higan/presentation/about.cpp
+++ b/higan/target-higan/presentation/about.cpp
@@ -3,7 +3,7 @@ AboutWindow::AboutWindow() {
 
   setTitle("About higan ...");
   setBackgroundColor({255, 255, 240});
-  layout.setMargin(10);
+  layout.setPadding(10);
   auto logo = image{Resource::Logo};
   logo.alphaBlend(0xfffff0);
   canvas.setIcon(logo);
diff --git a/higan/target-higan/presentation/presentation.cpp b/higan/target-higan/presentation/presentation.cpp
index 178ec580..07daff6f 100644
--- a/higan/target-higan/presentation/presentation.cpp
+++ b/higan/target-higan/presentation/presentation.cpp
@@ -171,7 +171,7 @@ auto Presentation::updateEmulator() -> void {
   inputPort2.setVisible(false).reset();
   inputPort3.setVisible(false).reset();
 
-  for(auto n : range(emulator->ports)) {
+  for(auto n : range(emulator->ports.size())) {
     if(n >= 3) break;
     auto& port = emulator->ports[n];
     auto& menu = (n == 0 ? inputPort1 : n == 1 ? inputPort2 : inputPort3);
diff --git a/higan/target-higan/settings/advanced.cpp b/higan/target-higan/settings/advanced.cpp
index 9bd58242..4ff634ff 100644
--- a/higan/target-higan/settings/advanced.cpp
+++ b/higan/target-higan/settings/advanced.cpp
@@ -2,7 +2,7 @@ AdvancedSettings::AdvancedSettings(TabFrame* parent) : TabFrameItem(parent) {
   setIcon(Icon::Action::Settings);
   setText("Advanced");
 
-  layout.setMargin(5);
+  layout.setPadding(5);
 
   driverLabel.setText("Driver Selection").setFont(Font().setBold());
   videoLabel.setText("Video:");
diff --git a/higan/target-higan/settings/audio.cpp b/higan/target-higan/settings/audio.cpp
index 62461669..d989759f 100644
--- a/higan/target-higan/settings/audio.cpp
+++ b/higan/target-higan/settings/audio.cpp
@@ -2,7 +2,7 @@ AudioSettings::AudioSettings(TabFrame* parent) : TabFrameItem(parent) {
   setIcon(Icon::Device::Speaker);
   setText("Audio");
 
-  layout.setMargin(5);
+  layout.setPadding(5);
 
   driverLabel.setFont(Font().setBold()).setText("Driver");
 
diff --git a/higan/target-higan/settings/hotkeys.cpp b/higan/target-higan/settings/hotkeys.cpp
index 1b51081c..f9668fff 100644
--- a/higan/target-higan/settings/hotkeys.cpp
+++ b/higan/target-higan/settings/hotkeys.cpp
@@ -2,7 +2,7 @@ HotkeySettings::HotkeySettings(TabFrame* parent) : TabFrameItem(parent) {
   setIcon(Icon::Device::Keyboard);
   setText("Hotkeys");
 
-  layout.setMargin(5);
+  layout.setPadding(5);
   mappingList.onActivate([&] { assignMapping(); });
   mappingList.onChange([&] { eraseButton.setEnabled((bool)mappingList.selected()); });
   resetButton.setText("Reset").onActivate([&] {
diff --git a/higan/target-higan/settings/input.cpp b/higan/target-higan/settings/input.cpp
index efeab594..1d7087bd 100644
--- a/higan/target-higan/settings/input.cpp
+++ b/higan/target-higan/settings/input.cpp
@@ -2,7 +2,7 @@ InputSettings::InputSettings(TabFrame* parent) : TabFrameItem(parent) {
   setIcon(Icon::Device::Joypad);
   setText("Input");
 
-  layout.setMargin(5);
+  layout.setPadding(5);
   defocusLabel.setText("When Focus is Lost:");
   pauseEmulation.setText("Pause Emulation").onActivate([&] {
     settings["Input/Defocus"].setValue("Pause");
@@ -87,7 +87,7 @@ auto InputSettings::reloadPorts() -> void {
 
 auto InputSettings::reloadDevices() -> void {
   deviceList.reset();
-  for(auto n : range(activePort().devices)) {
+  for(auto n : range(activePort().devices.size())) {
     auto& device = activePort().devices[n];
     if(!device.mappings) continue;  //do not display devices that have no configurable inputs
     deviceList.append(ComboButtonItem().setText(device.name).setProperty("index", n));
diff --git a/higan/target-higan/settings/settings.cpp b/higan/target-higan/settings/settings.cpp
index 59af5763..13385a65 100644
--- a/higan/target-higan/settings/settings.cpp
+++ b/higan/target-higan/settings/settings.cpp
@@ -81,7 +81,7 @@ auto Settings::save() -> void {
 SettingsManager::SettingsManager() {
   settingsManager = this;
 
-  layout.setMargin(5);
+  layout.setPadding(5);
   statusBar.setFont(Font().setBold());
 
   setTitle("Settings");
diff --git a/higan/target-higan/settings/system-properties.cpp b/higan/target-higan/settings/system-properties.cpp
index 24a1d66b..38f5a86f 100644
--- a/higan/target-higan/settings/system-properties.cpp
+++ b/higan/target-higan/settings/system-properties.cpp
@@ -1,7 +1,7 @@
 SystemProperties::SystemProperties() {
   systemProperties = this;
 
-  layout.setMargin(5);
+  layout.setPadding(5);
   systemLabel.setAlignment(1.0).setText("System:");
   for(auto& emulator : program->emulators) {
     systemOption.append(ComboButtonItem().setText(emulator->information.name));
diff --git a/higan/target-higan/settings/systems.cpp b/higan/target-higan/settings/systems.cpp
index 34a765d2..f7ec8515 100644
--- a/higan/target-higan/settings/systems.cpp
+++ b/higan/target-higan/settings/systems.cpp
@@ -2,7 +2,7 @@ SystemSettings::SystemSettings(TabFrame* parent) : TabFrameItem(parent) {
   setIcon(Icon::Device::Storage);
   setText("Systems");
 
-  layout.setMargin(5);
+  layout.setPadding(5);
 
   systemList.onActivate([&] {
     modifyButton.doActivate();
diff --git a/higan/target-higan/settings/video.cpp b/higan/target-higan/settings/video.cpp
index e572557d..7e56f62a 100644
--- a/higan/target-higan/settings/video.cpp
+++ b/higan/target-higan/settings/video.cpp
@@ -2,7 +2,7 @@ VideoSettings::VideoSettings(TabFrame* parent) : TabFrameItem(parent) {
   setIcon(Icon::Device::Display);
   setText("Video");
 
-  layout.setMargin(5);
+  layout.setPadding(5);
 
   colorAdjustmentLabel.setFont(Font().setBold()).setText("Color Adjustment");
   saturationLabel.setText("Saturation:");
diff --git a/higan/target-higan/tools/cheat-database.cpp b/higan/target-higan/tools/cheat-database.cpp
index d219506c..8e240eba 100644
--- a/higan/target-higan/tools/cheat-database.cpp
+++ b/higan/target-higan/tools/cheat-database.cpp
@@ -1,7 +1,7 @@
 CheatDatabase::CheatDatabase() {
   cheatDatabase = this;
 
-  layout.setMargin(5);
+  layout.setPadding(5);
   selectAllButton.setText("Select All").onActivate([&] {
     for(auto& item : cheatList.items()) item.setChecked(true);
   });
diff --git a/higan/target-higan/tools/cheat-editor.cpp b/higan/target-higan/tools/cheat-editor.cpp
index c10a4de2..3e8c0af1 100644
--- a/higan/target-higan/tools/cheat-editor.cpp
+++ b/higan/target-higan/tools/cheat-editor.cpp
@@ -2,7 +2,7 @@ CheatEditor::CheatEditor(TabFrame* parent) : TabFrameItem(parent) {
   setIcon(Icon::Edit::Replace);
   setText("Cheat Editor");
 
-  layout.setMargin(5);
+  layout.setPadding(5);
   cheatList.append(TableViewHeader().setVisible()
     .append(TableViewColumn())
     .append(TableViewColumn().setText("Slot").setForegroundColor({0, 128, 0}).setAlignment(1.0))
diff --git a/higan/target-higan/tools/game-notes.cpp b/higan/target-higan/tools/game-notes.cpp
index 64a35501..15c11118 100644
--- a/higan/target-higan/tools/game-notes.cpp
+++ b/higan/target-higan/tools/game-notes.cpp
@@ -2,7 +2,7 @@ GameNotes::GameNotes(TabFrame* parent) : TabFrameItem(parent) {
   setIcon(Icon::Emblem::Text);
   setText("Game Notes");
 
-  layout.setMargin(5);
+  layout.setPadding(5);
   notes.setWordWrap(false).setFont(Font().setFamily(Font::Mono));
 }
 
diff --git a/higan/target-higan/tools/manifest-viewer.cpp b/higan/target-higan/tools/manifest-viewer.cpp
index 1458c086..0e1af963 100644
--- a/higan/target-higan/tools/manifest-viewer.cpp
+++ b/higan/target-higan/tools/manifest-viewer.cpp
@@ -2,7 +2,7 @@ ManifestViewer::ManifestViewer(TabFrame* parent) : TabFrameItem(parent) {
   setIcon(Icon::Emblem::Text);
   setText("Manifest Viewer");
 
-  layout.setMargin(5);
+  layout.setPadding(5);
   manifestView.setEditable(false).setWordWrap(false).setFont(Font().setFamily(Font::Mono));
 }
 
diff --git a/higan/target-higan/tools/state-manager.cpp b/higan/target-higan/tools/state-manager.cpp
index 97a940f6..b5740208 100644
--- a/higan/target-higan/tools/state-manager.cpp
+++ b/higan/target-higan/tools/state-manager.cpp
@@ -2,7 +2,7 @@ StateManager::StateManager(TabFrame* parent) : TabFrameItem(parent) {
   setIcon(Icon::Application::FileManager);
   setText("State Manager");
 
-  layout.setMargin(5);
+  layout.setPadding(5);
   stateList.append(TableViewHeader().setVisible()
     .append(TableViewColumn().setText("Slot").setForegroundColor({0, 128, 0}).setAlignment(1.0))
     .append(TableViewColumn().setText("Description").setExpandable())
diff --git a/higan/target-higan/tools/tools.cpp b/higan/target-higan/tools/tools.cpp
index 5bad7ec4..2e1df384 100644
--- a/higan/target-higan/tools/tools.cpp
+++ b/higan/target-higan/tools/tools.cpp
@@ -10,7 +10,7 @@ unique_pointer<ToolsManager> toolsManager;
 ToolsManager::ToolsManager() {
   toolsManager = this;
 
-  layout.setMargin(5);
+  layout.setPadding(5);
 
   setTitle("Tools");
   setSize({600, 405});
diff --git a/higan/video/video.cpp b/higan/video/video.cpp
index 502a7741..b5a31568 100644
--- a/higan/video/video.cpp
+++ b/higan/video/video.cpp
@@ -101,7 +101,7 @@ auto Video::createSprite(uint width, uint height) -> shared_pointer<Sprite> {
 }
 
 auto Video::removeSprite(shared_pointer<Sprite> sprite) -> bool {
-  for(uint n : range(sprites)) {
+  for(uint n : range(sprites.size())) {
     if(sprite == sprites[n]) {
       sprites.remove(n);
       return true;
diff --git a/hiro/GNUmakefile b/hiro/GNUmakefile
index acdfbfe1..d5721578 100644
--- a/hiro/GNUmakefile
+++ b/hiro/GNUmakefile
@@ -1,6 +1,6 @@
 ifeq ($(platform),)
-  hiroflags = $(cppflags) $(flags) -DHIRO_REFERENCE
-  hirolink =
+  hiro.flags   = $(flags.cpp) -DHIRO_REFERENCE
+  hiro.options =
 endif
 
 ifeq ($(platform),windows)
@@ -9,18 +9,18 @@ ifeq ($(platform),windows)
   endif
 
   ifeq ($(hiro),windows)
-    hiroflags = $(cppflags) $(flags) -DHIRO_WINDOWS
-    hirolink = -lkernel32 -luser32 -lgdi32 -ladvapi32 -lole32 -lcomctl32 -lcomdlg32 -luxtheme -lmsimg32 -lshlwapi
+    hiro.flags   = $(flags.cpp) -DHIRO_WINDOWS
+    hiro.options = -lkernel32 -luser32 -lgdi32 -ladvapi32 -lole32 -lcomctl32 -lcomdlg32 -luxtheme -lmsimg32 -lshlwapi
   endif
 
   ifeq ($(hiro),gtk2)
-    hiroflags = $(cppflags) $(flags) -DHIRO_GTK=2 $(shell pkg-config --cflags gtk+-2.0 gtksourceview-2.0)
-    hirolink = $(shell pkg-config --libs gtk+-2.0 gtksourceview-2.0)
+    hiro.flags   = $(flags.cpp) -DHIRO_GTK=2 $(shell pkg-config --cflags gtk+-2.0 gtksourceview-2.0)
+    hiro.options = $(shell pkg-config --libs gtk+-2.0 gtksourceview-2.0)
   endif
 
   ifeq ($(hiro),gtk3)
-    hiroflags = $(cppflags) $(flags) -DHIRO_GTK=3 $(shell pkg-config --cflags gtk+-3.0 gtksourceview-3.0)
-    hirolink = $(shell pkg-config --libs gtk+-3.0 gtksourceview-3.0)
+    hiro.flags   = $(flags.cpp) -DHIRO_GTK=3 $(shell pkg-config --cflags gtk+-3.0 gtksourceview-3.0)
+    hiro.options = $(shell pkg-config --libs gtk+-3.0 gtksourceview-3.0)
   endif
 endif
 
@@ -30,8 +30,8 @@ ifeq ($(platform),macos)
   endif
 
   ifeq ($(hiro),cocoa)
-    hiroflags = $(objcppflags) $(flags) -w -DHIRO_COCOA
-    hirolink = -framework Cocoa -framework Carbon -framework Security
+    hiro.flags   = $(flags.objcpp) -w -DHIRO_COCOA
+    hiro.options = -framework Cocoa -framework Carbon -framework Security
   endif
 endif
 
@@ -41,24 +41,38 @@ ifneq ($(filter $(platform),linux bsd),)
   endif
 
   ifeq ($(hiro),gtk2)
-    hiroflags = $(cppflags) $(flags) -DHIRO_GTK=2 $(shell pkg-config --cflags gtk+-2.0 gtksourceview-2.0)
-    hirolink = -lX11 $(shell pkg-config --libs gtk+-2.0 gtksourceview-2.0)
+    hiro.flags   = $(flags.cpp) -DHIRO_GTK=2 $(shell pkg-config --cflags gtk+-2.0 gtksourceview-2.0)
+    hiro.options = -lX11 $(shell pkg-config --libs gtk+-2.0 gtksourceview-2.0)
   endif
 
   ifeq ($(hiro),gtk3)
-    hiroflags = $(cppflags) $(flags) -DHIRO_GTK=3 $(shell pkg-config --cflags gtk+-3.0 gtksourceview-3.0)
-    hirolink = -lX11 $(shell pkg-config --libs gtk+-3.0 gtksourceview-3.0)
+    hiro.flags   = $(flags.cpp) -DHIRO_GTK=3 $(shell pkg-config --cflags gtk+-3.0 gtksourceview-3.0)
+    hiro.options = -lX11 $(shell pkg-config --libs gtk+-3.0 gtksourceview-3.0)
   endif
 
   ifeq ($(hiro),qt4)
     moc = moc-qt4
-    hiroflags = $(cppflags) $(flags) -DHIRO_QT=4 $(shell pkg-config --cflags QtCore QtGui)
-    hirolink = -lX11 $(shell pkg-config --libs QtCore QtGui)
+    hiro.flags   = $(flags.cpp) -DHIRO_QT=4 $(shell pkg-config --cflags QtCore QtGui)
+    hiro.options = -lX11 $(shell pkg-config --libs QtCore QtGui)
   endif
 
   ifeq ($(hiro),qt5)
     moc = /usr/local/lib/qt5/bin/moc
-    hiroflags = -fPIC $(cppflags) $(flags) -DHIRO_QT=5 $(shell pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets)
-    hirolink = -lX11 $(shell pkg-config --libs Qt5Core Qt5Gui Qt5Widgets)
+    hiro.flags   = $(flags.cpp) -DHIRO_QT=5 -fPIC $(shell pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets)
+    hiro.options = -lX11 $(shell pkg-config --libs Qt5Core Qt5Gui Qt5Widgets)
   endif
 endif
+
+$(object.path)/hiro.o: $(hiro.path)/hiro.cpp $(call rwildcard,$(hiro.path)) $(call rwildcard,$(nall.path))
+	$(if $(filter qt%,$(hiro)),$(info Compiling $(hiro.path)/qt/qt.moc ...))
+	$(if $(filter qt%,$(hiro)),@$(moc) -i -o $(hiro.path)/qt/qt.moc $(hiro.path)/qt/qt.hpp)
+	$(info Compiling $< ...)
+	@$(compiler) $(flags) $(hiro.flags) -c $< -o $@
+
+ifeq ($(hiro.resource),)
+  hiro.resource := $(hiro.path)/windows/hiro.rc
+endif
+
+$(object.path)/hiro-resource.o: $(hiro.resource)
+	$(if $(filter windows,$(hiro)),$(info Compiling $< ...))
+	$(if $(filter windows,$(hiro)),@$(windres) $< $@)
diff --git a/hiro/cocoa/layout.cpp b/hiro/cocoa/layout.cpp
deleted file mode 100644
index 0412e00b..00000000
--- a/hiro/cocoa/layout.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-#if defined(Hiro_Layout)
-
-namespace hiro {
-
-auto pLayout::construct() -> void {
-  for(auto& sizable : state().sizables) sizable->construct();
-}
-
-auto pLayout::destruct() -> void {
-  for(auto& sizable : state().sizables) sizable->destruct();
-}
-
-auto pLayout::setEnabled(bool enabled) -> void {
-  for(auto& sizable : state().sizables) {
-    if(auto self = sizable->self()) self->setEnabled(enabled && sizable->enabled(true));
-  }
-}
-
-auto pLayout::setFont(const Font& font) -> void {
-  for(auto& sizable : state().sizables) {
-    if(auto self = sizable->self()) self->setFont(font ? font : sizable->font(true));
-  }
-}
-
-auto pLayout::setVisible(bool visible) -> void {
-  for(auto& sizable : state().sizables) {
-    if(auto self = sizable->self()) self->setVisible(visible && sizable->visible(true));
-  }
-}
-
-}
-
-#endif
diff --git a/hiro/cocoa/layout.hpp b/hiro/cocoa/layout.hpp
deleted file mode 100644
index fc2e5505..00000000
--- a/hiro/cocoa/layout.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#if defined(Hiro_Layout)
-
-namespace hiro {
-
-struct pLayout : pSizable {
-  Declare(Layout, Sizable);
-
-  auto setEnabled(bool enabled) -> void override;
-  auto setFont(const Font& font) -> void override;
-  auto setVisible(bool visible) -> void override;
-};
-
-}
-
-#endif
diff --git a/hiro/cocoa/object.cpp b/hiro/cocoa/object.cpp
index 3c6ac442..3e93e050 100644
--- a/hiro/cocoa/object.cpp
+++ b/hiro/cocoa/object.cpp
@@ -27,6 +27,9 @@ auto pObject::setFocused() -> void {
 auto pObject::setFont(const Font& font) -> void {
 }
 
+auto pObject::setParent(mObject* parent, int offset) -> void {
+}
+
 auto pObject::setVisible(bool visible) -> void {
 }
 
diff --git a/hiro/cocoa/object.hpp b/hiro/cocoa/object.hpp
index e1fc4dbb..ae3f1af3 100644
--- a/hiro/cocoa/object.hpp
+++ b/hiro/cocoa/object.hpp
@@ -2,7 +2,7 @@
 
 namespace hiro {
 
-struct pObject {
+struct pObject : mLock {
   pObject(mObject& reference) : reference(reference) {}
   virtual ~pObject() {}
   auto self() const -> mObject& { return (mObject&)reference; }
@@ -16,14 +16,10 @@ struct pObject {
   virtual auto setEnabled(bool enabled) -> void;
   virtual auto setFocused() -> void;
   virtual auto setFont(const Font& font) -> void;
+  virtual auto setParent(mObject* parent, int offset) -> void;
   virtual auto setVisible(bool visible) -> void;
 
-  auto locked() const -> bool { return locks != 0 || Application::state.quit; }
-  auto lock() -> void { ++locks; }
-  auto unlock() -> void { --locks; }
-
   mObject& reference;
-  signed locks = 0;
 };
 
 }
diff --git a/hiro/cocoa/platform.cpp b/hiro/cocoa/platform.cpp
index 2058fe52..91090b02 100644
--- a/hiro/cocoa/platform.cpp
+++ b/hiro/cocoa/platform.cpp
@@ -26,7 +26,6 @@
 #include "action/menu-radio-item.cpp"
 
 #include "sizable.cpp"
-#include "layout.cpp"
 
 #include "widget/widget.cpp"
 #include "widget/button.cpp"
diff --git a/hiro/cocoa/platform.hpp b/hiro/cocoa/platform.hpp
index 66c1e4c8..0a91cede 100644
--- a/hiro/cocoa/platform.hpp
+++ b/hiro/cocoa/platform.hpp
@@ -38,7 +38,6 @@ namespace hiro {
 #include "action/menu-radio-item.hpp"
 
 #include "sizable.hpp"
-#include "layout.hpp"
 
 #include "widget/widget.hpp"
 #include "widget/button.hpp"
diff --git a/hiro/cocoa/widget/frame.cpp b/hiro/cocoa/widget/frame.cpp
index 6460e1b9..2c7b2151 100644
--- a/hiro/cocoa/widget/frame.cpp
+++ b/hiro/cocoa/widget/frame.cpp
@@ -31,22 +31,22 @@ auto pFrame::destruct() -> void {
   }
 }
 
-auto pFrame::append(sLayout layout) -> void {
+auto pFrame::append(sSizable sizable) -> void {
 }
 
-auto pFrame::remove(sLayout layout) -> void {
+auto pFrame::remove(sSizable sizable) -> void {
 }
 
 auto pFrame::setEnabled(bool enabled) -> void {
   pWidget::setEnabled(enabled);
-  if(auto layout = _layout()) layout->setEnabled(layout->self().enabled(true));
+  if(auto& sizable = _sizable()) sizable->setEnabled(sizable->self().enabled(true));
 }
 
 auto pFrame::setFont(const Font& font) -> void {
   @autoreleasepool {
     [cocoaView setTitleFont:pFont::create(font)];
   }
-  if(auto layout = _layout()) layout->setFont(layout->self().font(true));
+  if(auto& sizable = _sizable()) sizable->setFont(sizable->self().font(true));
 }
 
 auto pFrame::setGeometry(Geometry geometry) -> void {
@@ -56,8 +56,8 @@ auto pFrame::setGeometry(Geometry geometry) -> void {
     geometry.x() - 3, geometry.y() - (empty ? size.height() - 2 : 1),
     geometry.width() + 6, geometry.height() + (empty ? size.height() + 2 : 5)
   });
-  if(auto layout = state().layout) {
-    layout->setGeometry({
+  if(auto& sizable = state().sizable) {
+    sizable->setGeometry({
       geometry.x() + 1, geometry.y() + (empty ? 1 : size.height() - 2),
       geometry.width() - 2, geometry.height() - (empty ? 1 : size.height() - 1)
     });
@@ -72,12 +72,12 @@ auto pFrame::setText(const string& text) -> void {
 
 auto pFrame::setVisible(bool visible) -> void {
   pWidget::setVisible(visible);
-  if(auto layout = _layout()) layout->setVisible(layout->self().visible(true));
+  if(auto& sizable = _sizable()) sizable->setVisible(sizable->self().visible(true));
 }
 
-auto pFrame::_layout() -> maybe<pLayout&> {
-  if(auto layout = state().layout) {
-    if(auto self = layout->self()) return *self;
+auto pFrame::_sizable() -> maybe<pSizable&> {
+  if(auto sizable = state().sizable) {
+    if(auto self = sizable->self()) return *self;
   }
   return nothing;
 }
diff --git a/hiro/cocoa/widget/frame.hpp b/hiro/cocoa/widget/frame.hpp
index 13335f91..6ae79413 100644
--- a/hiro/cocoa/widget/frame.hpp
+++ b/hiro/cocoa/widget/frame.hpp
@@ -12,15 +12,15 @@ namespace hiro {
 struct pFrame : pWidget {
   Declare(Frame, Widget)
 
-  auto append(sLayout layout) -> void;
-  auto remove(sLayout layout) -> void;
+  auto append(sSizable sizable) -> void;
+  auto remove(sSizable sizable) -> void;
   auto setEnabled(bool enabled) -> void override;
   auto setFont(const Font& font) -> void override;
   auto setGeometry(Geometry geometry) -> void override;
   auto setText(const string& text) -> void;
   auto setVisible(bool visible) -> void override;
 
-  auto _layout() -> maybe<pLayout&>;
+  auto _sizable() -> maybe<pSizable&>;
 
   CocoaFrame* cocoaFrame = nullptr;
 };
diff --git a/hiro/cocoa/widget/tab-frame-item.cpp b/hiro/cocoa/widget/tab-frame-item.cpp
index 96616a8f..82d19f79 100644
--- a/hiro/cocoa/widget/tab-frame-item.cpp
+++ b/hiro/cocoa/widget/tab-frame-item.cpp
@@ -8,10 +8,10 @@ auto pTabFrameItem::construct() -> void {
 auto pTabFrameItem::destruct() -> void {
 }
 
-auto pTabFrameItem::append(sLayout layout) -> void {
+auto pTabFrameItem::append(sSizable sizable) -> void {
 }
 
-auto pTabFrameItem::remove(sLayout layout) -> void {
+auto pTabFrameItem::remove(sSizable sizable) -> void {
 }
 
 auto pTabFrameItem::setClosable(bool closable) -> void {
diff --git a/hiro/cocoa/widget/tab-frame-item.hpp b/hiro/cocoa/widget/tab-frame-item.hpp
index ede2333d..99510ad4 100644
--- a/hiro/cocoa/widget/tab-frame-item.hpp
+++ b/hiro/cocoa/widget/tab-frame-item.hpp
@@ -5,8 +5,8 @@ namespace hiro {
 struct pTabFrameItem : pObject {
   Declare(TabFrameItem, Object)
 
-  auto append(sLayout layout) -> void;
-  auto remove(sLayout layout) -> void;
+  auto append(sSizable sizable) -> void;
+  auto remove(sSizable sizable) -> void;
   auto setClosable(bool closable) -> void;
   auto setIcon(const image& icon) -> void;
   auto setMovable(bool movable) -> void;
diff --git a/hiro/cocoa/window.cpp b/hiro/cocoa/window.cpp
index 9c6514fd..ea778440 100644
--- a/hiro/cocoa/window.cpp
+++ b/hiro/cocoa/window.cpp
@@ -213,12 +213,12 @@ auto pWindow::destruct() -> void {
   }
 }
 
-auto pWindow::append(sLayout layout) -> void {
-  layout->setGeometry(self().geometry().setPosition(0, 0));
-  statusBarReposition();
+auto pWindow::append(sMenuBar menuBar) -> void {
 }
 
-auto pWindow::append(sMenuBar menuBar) -> void {
+auto pWindow::append(sSizable sizable) -> void {
+  layout->setGeometry(self().geometry().setPosition(0, 0));
+  statusBarReposition();
 }
 
 auto pWindow::append(sStatusBar statusBar) -> void {
@@ -241,15 +241,15 @@ auto pWindow::frameMargin() const -> Geometry {
   }
 }
 
-auto pWindow::remove(sLayout layout) -> void {
+auto pWindow::remove(sMenuBar menuBar) -> void {
+}
+
+auto pWindow::remove(sSizable sizable) -> void {
   @autoreleasepool {
     [[cocoaWindow contentView] setNeedsDisplay:YES];
   }
 }
 
-auto pWindow::remove(sMenuBar menuBar) -> void {
-}
-
 auto pWindow::remove(sStatusBar statusBar) -> void {
   @autoreleasepool {
     [[cocoaWindow statusBar] setHidden:YES];
diff --git a/hiro/cocoa/window.hpp b/hiro/cocoa/window.hpp
index 26492f1f..1650064a 100644
--- a/hiro/cocoa/window.hpp
+++ b/hiro/cocoa/window.hpp
@@ -30,13 +30,13 @@ namespace hiro {
 struct pWindow : pObject {
   Declare(Window, Object)
 
-  auto append(sLayout layout) -> void;
   auto append(sMenuBar menuBar) -> void;
+  auto append(sSizable sizable) -> void;
   auto append(sStatusBar statusBar) -> void;
   auto focused() const -> bool override;
   auto frameMargin() const -> Geometry;
-  auto remove(sLayout layout) -> void;
   auto remove(sMenuBar menuBar) -> void;
+  auto remove(sSizable sizable) -> void;
   auto remove(sStatusBar statusBar) -> void;
   auto setBackgroundColor(Color color) -> void;
   auto setDismissable(bool dismissable) -> void;
diff --git a/hiro/components.hpp b/hiro/components.hpp
index 6efaaf61..d05fbfec 100644
--- a/hiro/components.hpp
+++ b/hiro/components.hpp
@@ -47,7 +47,6 @@
 #define Hiro_MenuRadioItem
 
 #define Hiro_Sizable
-#define Hiro_Layout
 #define Hiro_Widget
 #define Hiro_Button
 #define Hiro_Canvas
@@ -94,6 +93,7 @@
 #define Hiro_FixedLayout
 #define Hiro_HorizontalLayout
 #define Hiro_VerticalLayout
+#define Hiro_TableLayout
 
 #if defined(Hiro_TableView)
   #define Hiro_ListView
diff --git a/hiro/core/action/menu.cpp b/hiro/core/action/menu.cpp
index 37678cdd..4444e293 100644
--- a/hiro/core/action/menu.cpp
+++ b/hiro/core/action/menu.cpp
@@ -59,7 +59,7 @@ auto mMenu::setIcon(const image& icon) -> type& {
 }
 
 auto mMenu::setParent(mObject* parent, signed offset) -> type& {
-  for(auto n : rrange(state.actions)) state.actions[n]->destruct();
+  for(auto& action : reverse(state.actions)) action->destruct();
   mObject::setParent(parent, offset);
   for(auto& action : state.actions) action->setParent(this, action->offset());
   return *this;
diff --git a/hiro/core/core.cpp b/hiro/core/core.cpp
index f7eea111..e64f58c1 100644
--- a/hiro/core/core.cpp
+++ b/hiro/core/core.cpp
@@ -68,7 +68,6 @@ namespace hiro {
   #include "action/menu-radio-item.cpp"
 
   #include "sizable.cpp"
-  #include "layout.cpp"
 
   #include "widget/widget.cpp"
   #include "widget/button.cpp"
diff --git a/hiro/core/core.hpp b/hiro/core/core.hpp
index b222840c..4302dd14 100644
--- a/hiro/core/core.hpp
+++ b/hiro/core/core.hpp
@@ -51,7 +51,6 @@ Declare(MenuItem)
 Declare(MenuCheckItem)
 Declare(MenuRadioItem)
 Declare(Sizable)
-Declare(Layout)
 Declare(Widget)
 Declare(Button)
 Declare(Canvas)
@@ -98,7 +97,7 @@ struct Color {
   using type = Color;
 
   Color();
-  Color(signed red, signed green, signed blue, signed alpha = 255);
+  Color(int red, int green, int blue, int alpha = 255);
 
   explicit operator bool() const;
   auto operator==(const Color& source) const -> bool;
@@ -109,12 +108,12 @@ struct Color {
   auto green() const -> uint8_t;
   auto red() const -> uint8_t;
   auto reset() -> type&;
-  auto setAlpha(signed alpha) -> type&;
-  auto setBlue(signed blue) -> type&;
+  auto setAlpha(int alpha) -> type&;
+  auto setBlue(int blue) -> type&;
   auto setColor(Color color = {}) -> type&;
-  auto setColor(signed red, signed green, signed blue, signed alpha = 255) -> type&;
-  auto setGreen(signed green) -> type&;
-  auto setRed(signed red) -> type&;
+  auto setColor(int red, int green, int blue, int alpha = 255) -> type&;
+  auto setGreen(int green) -> type&;
+  auto setRed(int red) -> type&;
   auto value() const -> uint32_t;
 
 //private:
@@ -178,22 +177,22 @@ struct Alignment {
 struct Cursor {
   using type = Cursor;
 
-  Cursor(signed offset = 0, signed length = 0);
+  Cursor(int offset = 0, int length = 0);
 
   explicit operator bool() const;
   auto operator==(const Cursor& source) const -> bool;
   auto operator!=(const Cursor& source) const -> bool;
 
-  auto length() const -> signed;
-  auto offset() const -> signed;
-  auto setCursor(signed offset = 0, signed length = 0) -> type&;
-  auto setLength(signed length = 0) -> type&;
-  auto setOffset(signed offset = 0) -> type&;
+  auto length() const -> int;
+  auto offset() const -> int;
+  auto setCursor(int offset = 0, int length = 0) -> type&;
+  auto setLength(int length = 0) -> type&;
+  auto setOffset(int offset = 0) -> type&;
 
 //private:
   struct State {
-    signed offset;
-    signed length;
+    int offset;
+    int length;
   } state;
 };
 #endif
@@ -359,7 +358,7 @@ struct Hotkey {
 //private:
   struct State {
     bool active = false;
-    vector<unsigned> keys;
+    vector<uint> keys;
     function<void ()> onPress;
     function<void ()> onRelease;
     string sequence;
@@ -458,8 +457,8 @@ struct Keyboard {
   Keyboard() = delete;
 
   static auto append(Hotkey hotkey) -> void;
-  static auto hotkey(unsigned position) -> Hotkey;
-  static auto hotkeyCount() -> unsigned;
+  static auto hotkey(uint position) -> Hotkey;
+  static auto hotkeyCount() -> uint;
   static auto hotkeys() -> vector<Hotkey>;
   static auto poll() -> vector<bool>;
   static auto pressed(const string& key) -> bool;
@@ -478,7 +477,7 @@ struct Keyboard {
 
 #if defined(Hiro_Mouse)
 struct Mouse {
-  enum class Button : unsigned { Left, Middle, Right };
+  enum class Button : uint { Left, Middle, Right };
 
   Mouse() = delete;
 
@@ -512,8 +511,8 @@ struct BrowserWindow {
 
 #if defined(Hiro_MessageWindow)
 struct MessageWindow {
-  enum class Buttons : unsigned { Ok, OkCancel, YesNo, YesNoCancel };
-  enum class Response : unsigned { Ok, Cancel, Yes, No };
+  enum class Buttons : uint { Ok, OkCancel, YesNo, YesNoCancel };
+  enum class Response : uint { Ok, Cancel, Yes, No };
 
   using type = MessageWindow;
 
@@ -585,18 +584,17 @@ struct mObject {
   explicit operator bool() const;
 
   auto abstract() const -> bool;
-  auto adjustOffset(signed displacement) -> type&;
+  auto adjustOffset(int displacement) -> type&;
   auto enabled(bool recursive = false) const -> bool;
   virtual auto focused() const -> bool;
   auto font(bool recursive = false) const -> Font;
   virtual auto group() const -> Group;
-  auto offset() const -> signed;
+  auto offset() const -> int;
   auto parent() const -> mObject*;
   auto parentComboButton(bool recursive = false) const -> mComboButton*;
   auto parentComboEdit(bool recursive = false) const -> mComboEdit*;
   auto parentFrame(bool recursive = false) const -> mFrame*;
   auto parentIconView(bool recursive = false) const -> mIconView*;
-  auto parentLayout(bool recursive = false) const -> mLayout*;
   auto parentMenu(bool recursive = false) const -> mMenu*;
   auto parentMenuBar(bool recursive = false) const -> mMenuBar*;
   auto parentPopupMenu(bool recursive = false) const -> mPopupMenu*;
@@ -617,7 +615,7 @@ struct mObject {
   virtual auto setFocused() -> type&;
   virtual auto setFont(const Font& font = {}) -> type&;
   virtual auto setGroup(sGroup group = {}) -> type&;
-  virtual auto setParent(mObject* parent = nullptr, signed offset = -1) -> type&;
+  virtual auto setParent(mObject* parent = nullptr, int offset = -1) -> type&;
   virtual auto setProperty(const string& name, const string& value = "") -> type&;
   virtual auto setVisible(bool visible = true) -> type&;
   auto visible(bool recursive = false) const -> bool;
@@ -626,7 +624,7 @@ struct mObject {
   struct State {
     bool enabled = true;
     Font font;
-    signed offset = -1;
+    int offset = -1;
     mObject* parent = nullptr;
     set<Property> properties;
     bool visible = true;
@@ -646,8 +644,8 @@ struct mGroup : mObject {
   using mObject::remove;
 
   auto append(sObject object) -> type&;
-  auto object(unsigned offset) const -> Object;
-  auto objectCount() const -> unsigned;
+  auto object(uint offset) const -> Object;
+  auto objectCount() const -> uint;
   auto objects() const -> vector<Object>;
   auto remove(sObject object) -> type&;
 
@@ -663,13 +661,13 @@ struct mTimer : mObject {
   Declare(Timer)
 
   auto doActivate() const -> void;
-  auto interval() const -> unsigned;
+  auto interval() const -> uint;
   auto onActivate(const function<void ()>& callback = {}) -> type&;
-  auto setInterval(unsigned interval = 0) -> type&;
+  auto setInterval(uint interval = 0) -> type&;
 
 //private:
   struct State {
-    unsigned interval = 0;
+    uint interval = 0;
     function<void ()> onActivate;
   } state;
 };
@@ -680,22 +678,23 @@ struct mWindow : mObject {
   Declare(Window)
   using mObject::remove;
 
-  auto append(sLayout layout) -> type&;
+  mWindow();
+
   auto append(sMenuBar menuBar) -> type&;
+  auto append(sSizable sizable) -> type&;
   auto append(sStatusBar statusBar) -> type&;
   auto backgroundColor() const -> Color;
   auto dismissable() const -> bool;
   auto doClose() const -> void;
   auto doDrop(string_vector) const -> void;
-  auto doKeyPress(signed) const -> void;
-  auto doKeyRelease(signed) const -> void;
+  auto doKeyPress(int) const -> void;
+  auto doKeyRelease(int) const -> void;
   auto doMove() const -> void;
   auto doSize() const -> void;
   auto droppable() const -> bool;
   auto frameGeometry() const -> Geometry;
   auto fullScreen() const -> bool;
   auto geometry() const -> Geometry;
-  auto layout() const -> Layout;
   auto maximized() const -> bool;
   auto maximumSize() const -> Size;
   auto menuBar() const -> MenuBar;
@@ -704,12 +703,12 @@ struct mWindow : mObject {
   auto modal() const -> bool;
   auto onClose(const function<void ()>& callback = {}) -> type&;
   auto onDrop(const function<void (string_vector)>& callback = {}) -> type&;
-  auto onKeyPress(const function<void (signed)>& callback = {}) -> type&;
-  auto onKeyRelease(const function<void (signed)>& callback = {}) -> type&;
+  auto onKeyPress(const function<void (int)>& callback = {}) -> type&;
+  auto onKeyRelease(const function<void (int)>& callback = {}) -> type&;
   auto onMove(const function<void ()>& callback = {}) -> type&;
   auto onSize(const function<void ()>& callback = {}) -> type&;
-  auto remove(sLayout layout) -> type&;
   auto remove(sMenuBar menuBar) -> type&;
+  auto remove(sSizable sizable) -> type&;
   auto remove(sStatusBar statusBar) -> type&;
   auto reset() -> type& override;
   auto resizable() const -> bool;
@@ -732,6 +731,8 @@ struct mWindow : mObject {
   auto setResizable(bool resizable = true) -> type&;
   auto setSize(Size size) -> type&;
   auto setTitle(const string& title = "") -> type&;
+  auto setVisible(bool visible = true) -> type&;
+  auto sizable() const -> Sizable;
   auto statusBar() const -> StatusBar;
   auto title() const -> string;
 
@@ -742,7 +743,6 @@ struct mWindow : mObject {
     bool droppable = false;
     bool fullScreen = false;
     Geometry geometry = {128, 128, 256, 256};
-    sLayout layout;
     bool maximized = false;
     Size maximumSize;
     bool minimized = false;
@@ -751,11 +751,12 @@ struct mWindow : mObject {
     bool modal = false;
     function<void ()> onClose;
     function<void (string_vector)> onDrop;
-    function<void (signed)> onKeyPress;
-    function<void (signed)> onKeyRelease;
+    function<void (int)> onKeyPress;
+    function<void (int)> onKeyRelease;
     function<void ()> onMove;
     function<void ()> onSize;
     bool resizable = true;
+    sSizable sizable;
     sStatusBar statusBar;
     string title;
   } state;
@@ -784,13 +785,13 @@ struct mMenuBar : mObject {
   Declare(MenuBar)
 
   auto append(sMenu menu) -> type&;
-  auto menu(unsigned position) const -> Menu;
-  auto menuCount() const -> unsigned;
+  auto menu(uint position) const -> Menu;
+  auto menuCount() const -> uint;
   auto menus() const -> vector<Menu>;
   auto remove() -> type& override;
   auto remove(sMenu menu) -> type&;
   auto reset() -> type&;
-  auto setParent(mObject* parent = nullptr, signed offset = -1) -> type& override;
+  auto setParent(mObject* parent = nullptr, int offset = -1) -> type& override;
 
 //private:
   struct State {
@@ -806,13 +807,13 @@ struct mPopupMenu : mObject {
   Declare(PopupMenu)
   using mObject::remove;
 
-  auto action(unsigned position) const -> Action;
-  auto actionCount() const -> unsigned;
+  auto action(uint position) const -> Action;
+  auto actionCount() const -> uint;
   auto actions() const -> vector<Action>;
   auto append(sAction action) -> type&;
   auto remove(sAction action) -> type&;
   auto reset() -> type&;
-  auto setParent(mObject* parent = nullptr, signed offset = -1) -> type& override;
+  auto setParent(mObject* parent = nullptr, int offset = -1) -> type& override;
   auto setVisible(bool visible = true) -> type& override;
 
 //private:
@@ -841,15 +842,15 @@ struct mMenu : mAction {
   Declare(Menu)
   using mObject::remove;
 
-  auto action(unsigned position) const -> Action;
-  auto actionCount() const -> unsigned;
+  auto action(uint position) const -> Action;
+  auto actionCount() const -> uint;
   auto actions() const -> vector<Action>;
   auto append(sAction action) -> type&;
   auto icon() const -> image;
   auto remove(sAction action) -> type&;
   auto reset() -> type&;
   auto setIcon(const image& icon = {}) -> type&;
-  auto setParent(mObject* parent = nullptr, signed offset = -1) -> type& override;
+  auto setParent(mObject* parent = nullptr, int offset = -1) -> type& override;
   auto setText(const string& text = "") -> type&;
   auto text() const -> string;
 
@@ -952,28 +953,6 @@ struct mSizable : mObject {
 };
 #endif
 
-#if defined(Hiro_Layout)
-struct mLayout : mSizable {
-  Declare(Layout)
-
-  virtual auto append(sSizable sizable) -> type&;
-  virtual auto remove() -> type& override;
-  virtual auto remove(sSizable sizable) -> type&;
-  virtual auto reset() -> type&;
-  auto setParent(mObject* parent = nullptr, signed offset = -1) -> type& override;
-  auto sizable(unsigned position) const -> Sizable;
-  auto sizableCount() const -> unsigned;
-  auto sizables() const -> vector<Sizable>;
-
-//private:
-  struct State {
-    vector<sSizable> sizables;
-  } state;
-
-  auto destruct() -> void override;
-};
-#endif
-
 #if defined(Hiro_Widget)
 struct mWidget : mSizable {
   Declare(Widget)
@@ -1113,14 +1092,14 @@ struct mComboButton : mWidget {
 
   auto append(sComboButtonItem item) -> type&;
   auto doChange() const -> void;
-  auto item(unsigned position) const -> ComboButtonItem;
-  auto itemCount() const -> unsigned;
+  auto item(uint position) const -> ComboButtonItem;
+  auto itemCount() const -> uint;
   auto items() const -> vector<ComboButtonItem>;
   auto onChange(const function<void ()>& callback = {}) -> type&;
   auto remove(sComboButtonItem item) -> type&;
   auto reset() -> type&;
   auto selected() const -> ComboButtonItem;
-  auto setParent(mObject* parent = nullptr, signed offset = -1) -> type& override;
+  auto setParent(mObject* parent = nullptr, int offset = -1) -> type& override;
 
 //private:
   struct State {
@@ -1241,17 +1220,17 @@ struct mFrame : mWidget {
   Declare(Frame)
   using mObject::remove;
 
-  auto append(sLayout layout) -> type&;
-  auto layout() const -> Layout;
-  auto remove(sLayout layout) -> type&;
+  auto append(sSizable sizable) -> type&;
+  auto remove(sSizable sizable) -> type&;
   auto reset() -> type&;
-  auto setParent(mObject* parent = nullptr, signed offset = -1) -> type& override;
+  auto setParent(mObject* parent = nullptr, int offset = -1) -> type& override;
   auto setText(const string& text = "") -> type&;
+  auto sizable() const -> Sizable;
   auto text() const -> string;
 
 //private:
   struct State {
-    sLayout layout;
+    sSizable sizable;
     string text;
   } state;
 
@@ -1263,34 +1242,34 @@ struct mFrame : mWidget {
 struct mHexEdit : mWidget {
   Declare(HexEdit)
 
-  auto address() const -> unsigned;
+  auto address() const -> uint;
   auto backgroundColor() const -> Color;
-  auto columns() const -> unsigned;
-  auto doRead(unsigned offset) const -> uint8_t;
-  auto doWrite(unsigned offset, uint8_t data) const -> void;
+  auto columns() const -> uint;
+  auto doRead(uint offset) const -> uint8_t;
+  auto doWrite(uint offset, uint8_t data) const -> void;
   auto foregroundColor() const -> Color;
-  auto length() const -> unsigned;
-  auto onRead(const function<uint8_t (unsigned)>& callback = {}) -> type&;
-  auto onWrite(const function<void (unsigned, uint8_t)>& callback = {}) -> type&;
-  auto rows() const -> unsigned;
-  auto setAddress(unsigned address = 0) -> type&;
+  auto length() const -> uint;
+  auto onRead(const function<uint8_t (uint)>& callback = {}) -> type&;
+  auto onWrite(const function<void (uint, uint8_t)>& callback = {}) -> type&;
+  auto rows() const -> uint;
+  auto setAddress(uint address = 0) -> type&;
   auto setBackgroundColor(Color color = {}) -> type&;
-  auto setColumns(unsigned columns = 16) -> type&;
+  auto setColumns(uint columns = 16) -> type&;
   auto setForegroundColor(Color color = {}) -> type&;
-  auto setLength(unsigned length) -> type&;
-  auto setRows(unsigned rows = 16) -> type&;
+  auto setLength(uint length) -> type&;
+  auto setRows(uint rows = 16) -> type&;
   auto update() -> type&;
 
 //private:
   struct State {
-    unsigned address = 0;
+    uint address = 0;
     Color backgroundColor;
-    unsigned columns = 16;
+    uint columns = 16;
     Color foregroundColor;
-    unsigned length = 0;
-    function<uint8_t (unsigned)> onRead;
-    function<void (unsigned, uint8_t)> onWrite;
-    unsigned rows = 16;
+    uint length = 0;
+    function<uint8_t (uint)> onRead;
+    function<void (uint, uint8_t)> onWrite;
+    uint rows = 16;
   } state;
 };
 #endif
@@ -1300,17 +1279,17 @@ struct mHorizontalScrollBar : mWidget {
   Declare(HorizontalScrollBar)
 
   auto doChange() const -> void;
-  auto length() const -> unsigned;
+  auto length() const -> uint;
   auto onChange(const function<void ()>& callback = {}) -> type&;
-  auto position() const -> unsigned;
-  auto setLength(unsigned length = 101) -> type&;
-  auto setPosition(unsigned position = 0) -> type&;
+  auto position() const -> uint;
+  auto setLength(uint length = 101) -> type&;
+  auto setPosition(uint position = 0) -> type&;
 
 //private:
   struct State {
-    unsigned length = 101;
+    uint length = 101;
     function<void ()> onChange;
-    unsigned position = 0;
+    uint position = 0;
   } state;
 };
 #endif
@@ -1320,17 +1299,17 @@ struct mHorizontalSlider : mWidget {
   Declare(HorizontalSlider)
 
   auto doChange() const -> void;
-  auto length() const -> unsigned;
+  auto length() const -> uint;
   auto onChange(const function<void ()>& callback = {}) -> type&;
-  auto position() const -> unsigned;
-  auto setLength(unsigned length = 101) -> type&;
-  auto setPosition(unsigned position = 0) -> type&;
+  auto position() const -> uint;
+  auto setLength(uint length = 101) -> type&;
+  auto setPosition(uint position = 0) -> type&;
 
 //private:
   struct State {
-    unsigned length = 101;
+    uint length = 101;
     function<void ()> onChange;
-    unsigned position = 0;
+    uint position = 0;
   } state;
 };
 #endif
@@ -1349,8 +1328,8 @@ struct mIconView : mWidget {
   auto doContext() const -> void;
   auto flow() const -> Orientation;
   auto foregroundColor() const -> Color;
-  auto item(unsigned position) const -> IconViewItem;
-  auto itemCount() const -> unsigned;
+  auto item(uint position) const -> IconViewItem;
+  auto itemCount() const -> uint;
   auto items() const -> vector<IconViewItem>;
   auto onActivate(const function<void ()>& callback = {}) -> type&;
   auto onChange(const function<void ()>& callback = {}) -> type&;
@@ -1364,8 +1343,8 @@ struct mIconView : mWidget {
   auto setFlow(Orientation flow = Orientation::Vertical) -> type&;
   auto setForegroundColor(Color color = {}) -> type&;
   auto setOrientation(Orientation orientation = Orientation::Horizontal) -> type&;
-  auto setParent(mObject* object = nullptr, signed offset = -1) -> type& override;
-  auto setSelected(const vector<signed>& selections) -> type&;
+  auto setParent(mObject* object = nullptr, int offset = -1) -> type& override;
+  auto setSelected(const vector<int>& selections) -> type&;
 
 //private:
   struct State {
@@ -1461,12 +1440,12 @@ struct mLineEdit : mWidget {
 struct mProgressBar : mWidget {
   Declare(ProgressBar)
 
-  auto position() const -> unsigned;
-  auto setPosition(unsigned position) -> type&;
+  auto position() const -> uint;
+  auto setPosition(uint position) -> type&;
 
 //private:
   struct State {
-    unsigned position = 0;
+    uint position = 0;
   } state;
 };
 #endif
@@ -1559,8 +1538,8 @@ struct mTabFrame : mWidget {
   auto doChange() const -> void;
   auto doClose(sTabFrameItem item) const -> void;
   auto doMove(sTabFrameItem from, sTabFrameItem to) const -> void;
-  auto item(unsigned position) const -> TabFrameItem;
-  auto itemCount() const -> unsigned;
+  auto item(uint position) const -> TabFrameItem;
+  auto itemCount() const -> uint;
   auto items() const -> vector<TabFrameItem>;
   auto navigation() const -> Navigation;
   auto onChange(const function<void ()>& callback = {}) -> type&;
@@ -1569,8 +1548,11 @@ struct mTabFrame : mWidget {
   auto remove(sTabFrameItem item) -> type&;
   auto reset() -> type&;
   auto selected() const -> TabFrameItem;
+  auto setEnabled(bool enabled = true) -> type& override;
+  auto setFont(const Font& font = {}) -> type& override;
   auto setNavigation(Navigation navigation = Navigation::Top) -> type&;
-  auto setParent(mObject* object = nullptr, signed offset = -1) -> type& override;
+  auto setParent(mObject* object = nullptr, int offset = -1) -> type& override;
+  auto setVisible(bool visible = true) -> type& override;
 
 //private:
   struct State {
@@ -1589,30 +1571,33 @@ struct mTabFrame : mWidget {
 struct mTabFrameItem : mObject {
   Declare(TabFrameItem)
 
-  auto append(sLayout layout) -> type&;
+  auto append(sSizable sizable) -> type&;
   auto closable() const -> bool;
   auto icon() const -> image;
-  auto layout() const -> Layout;
   auto movable() const -> bool;
   auto remove() -> type& override;
-  auto remove(sLayout layout) -> type&;
+  auto remove(sSizable sizable) -> type&;
   auto reset() -> type&;
   auto selected() const -> bool;
   auto setClosable(bool closable = true) -> type&;
+  auto setEnabled(bool enabled = true) -> type& override;
+  auto setFont(const Font& font = {}) -> type& override;
   auto setIcon(const image& icon = {}) -> type&;
   auto setMovable(bool movable = true) -> type&;
-  auto setParent(mObject* object = nullptr, signed offset = -1) -> type& override;
+  auto setParent(mObject* object = nullptr, int offset = -1) -> type& override;
   auto setSelected() -> type&;
   auto setText(const string& text = "") -> type&;
+  auto setVisible(bool visible = true) -> type& override;
+  auto sizable() const -> Sizable;
   auto text() const -> string;
 
 //private:
   struct State {
     bool closable = false;
     image icon;
-    sLayout layout;
     bool movable = false;
     bool selected = false;
+    sSizable sizable;
     string text;
   } state;
 
@@ -1640,8 +1625,8 @@ struct mTableView : mWidget {
   auto doToggle(sTableViewCell cell) const -> void;
   auto foregroundColor() const -> Color;
   auto header() const -> TableViewHeader;
-  auto item(unsigned position) const -> TableViewItem;
-  auto itemCount() const -> unsigned;
+  auto item(uint position) const -> TableViewItem;
+  auto itemCount() const -> uint;
   auto items() const -> vector<TableViewItem>;
   auto onActivate(const function<void ()>& callback = {}) -> type&;
   auto onChange(const function<void ()>& callback = {}) -> type&;
@@ -1659,11 +1644,11 @@ struct mTableView : mWidget {
   auto setBatchable(bool batchable = true) -> type&;
   auto setBordered(bool bordered = true) -> type&;
   auto setForegroundColor(Color color = {}) -> type&;
-  auto setParent(mObject* parent = nullptr, signed offset = -1) -> type& override;
+  auto setParent(mObject* parent = nullptr, int offset = -1) -> type& override;
 
 //private:
   struct State {
-    unsigned activeColumn = 0;
+    uint activeColumn = 0;
     Alignment alignment;
     Color backgroundColor;
     bool batchable = false;
@@ -1688,18 +1673,20 @@ struct mTableViewHeader : mObject {
   Declare(TableViewHeader)
 
   auto append(sTableViewColumn column) -> type&;
-  auto column(unsigned position) const -> TableViewColumn;
-  auto columnCount() const -> unsigned;
+  auto column(uint position) const -> TableViewColumn;
+  auto columnCount() const -> uint;
   auto columns() const -> vector<TableViewColumn>;
   auto remove() -> type& override;
   auto remove(sTableViewColumn column) -> type&;
   auto reset() -> type&;
-  auto setParent(mObject* parent = nullptr, signed offset = -1) -> type& override;
+  auto setParent(mObject* parent = nullptr, int offset = -1) -> type& override;
 
 //private:
   struct State {
     vector<sTableViewColumn> columns;
   } state;
+
+  auto destruct() -> void override;
 };
 #endif
 
@@ -1762,8 +1749,8 @@ struct mTableViewItem : mObject {
   auto alignment() const -> Alignment;
   auto append(sTableViewCell cell) -> type&;
   auto backgroundColor() const -> Color;
-  auto cell(unsigned position) const -> TableViewCell;
-  auto cellCount() const -> unsigned;
+  auto cell(uint position) const -> TableViewCell;
+  auto cellCount() const -> uint;
   auto cells() const -> vector<TableViewCell>;
   auto foregroundColor() const -> Color;
   auto remove() -> type& override;
@@ -1774,7 +1761,7 @@ struct mTableViewItem : mObject {
   auto setBackgroundColor(Color color = {}) -> type&;
   auto setFocused() -> type& override;
   auto setForegroundColor(Color color = {}) -> type&;
-  auto setParent(mObject* parent = nullptr, signed offset = -1) -> type& override;
+  auto setParent(mObject* parent = nullptr, int offset = -1) -> type& override;
   auto setSelected(bool selected = true) -> type&;
 
 //private:
@@ -1785,6 +1772,8 @@ struct mTableViewItem : mObject {
     Color foregroundColor;
     bool selected = false;
   } state;
+
+  auto destruct() -> void override;
 };
 #endif
 
@@ -1869,7 +1858,7 @@ struct mTreeView : mWidget {
   auto doToggle(sTreeViewItem item) const -> void;
   auto foregroundColor() const -> Color;
   auto item(const string& path) const -> TreeViewItem;
-  auto itemCount() const -> unsigned;
+  auto itemCount() const -> uint;
   auto items() const -> vector<TreeViewItem>;
   auto onActivate(const function<void ()>& callback = {}) -> type&;
   auto onChange(const function<void ()>& callback = {}) -> type&;
@@ -1880,7 +1869,7 @@ struct mTreeView : mWidget {
   auto selected() const -> TreeViewItem;
   auto setBackgroundColor(Color color = {}) -> type&;
   auto setForegroundColor(Color color = {}) -> type&;
-  auto setParent(mObject* parent = nullptr, signed offset = -1) -> type&;
+  auto setParent(mObject* parent = nullptr, int offset = -1) -> type&;
 
 //private:
   struct State {
@@ -1909,7 +1898,7 @@ struct mTreeViewItem : mObject {
   auto foregroundColor(bool recursive = false) const -> Color;
   auto icon() const -> image;
   auto item(const string& path) const -> TreeViewItem;
-  auto itemCount() const -> unsigned;
+  auto itemCount() const -> uint;
   auto items() const -> vector<TreeViewItem>;
   auto path() const -> string;
   auto remove() -> type& override;
@@ -1922,7 +1911,7 @@ struct mTreeViewItem : mObject {
   auto setFocused() -> type& override;
   auto setForegroundColor(Color color = {}) -> type&;
   auto setIcon(const image& icon = {}) -> type&;
-  auto setParent(mObject* parent = nullptr, signed offset = -1) -> type&;
+  auto setParent(mObject* parent = nullptr, int offset = -1) -> type&;
   auto setSelected() -> type&;
   auto setText(const string& text = "") -> type&;
   auto text() const -> string;
@@ -1947,17 +1936,17 @@ struct mVerticalScrollBar : mWidget {
   Declare(VerticalScrollBar)
 
   auto doChange() const -> void;
-  auto length() const -> unsigned;
+  auto length() const -> uint;
   auto onChange(const function<void ()>& callback = {}) -> type&;
-  auto position() const -> unsigned;
-  auto setLength(unsigned length = 101) -> type&;
-  auto setPosition(unsigned position = 0) -> type&;
+  auto position() const -> uint;
+  auto setLength(uint length = 101) -> type&;
+  auto setPosition(uint position = 0) -> type&;
 
 //private:
   struct State {
-    unsigned length = 101;
+    uint length = 101;
     function<void ()> onChange;
-    unsigned position = 0;
+    uint position = 0;
   } state;
 };
 #endif
@@ -1967,17 +1956,17 @@ struct mVerticalSlider : mWidget {
   Declare(VerticalSlider)
 
   auto doChange() const -> void;
-  auto length() const -> unsigned;
+  auto length() const -> uint;
   auto onChange(const function<void ()>& callback = {}) -> type&;
-  auto position() const -> unsigned;
-  auto setLength(unsigned length = 101) -> type&;
-  auto setPosition(unsigned position = 0) -> type&;
+  auto position() const -> uint;
+  auto setLength(uint length = 101) -> type&;
+  auto setPosition(uint position = 0) -> type&;
 
 //private:
   struct State {
-    unsigned length = 101;
+    uint length = 101;
     function<void ()> onChange;
-    unsigned position = 0;
+    uint position = 0;
   } state;
 };
 #endif
@@ -2014,6 +2003,7 @@ struct mViewport : mWidget {
 
 #undef Declare
 
+#include "lock.hpp"
 #include "shared.hpp"
 
 }
diff --git a/hiro/core/gradient.cpp b/hiro/core/gradient.cpp
index 946ad0f5..bf1cc5ee 100644
--- a/hiro/core/gradient.cpp
+++ b/hiro/core/gradient.cpp
@@ -9,7 +9,7 @@ Gradient::operator bool() const {
 
 auto Gradient::operator==(const Gradient& source) const -> bool {
   if(state.colors.size() != source.state.colors.size()) return false;
-  for(auto n : range(state.colors)) {
+  for(auto n : range(state.colors.size())) {
     if(state.colors[n] != source.state.colors[n]) return false;
   }
   return true;
diff --git a/hiro/core/group.cpp b/hiro/core/group.cpp
index e7691b6d..c420608d 100644
--- a/hiro/core/group.cpp
+++ b/hiro/core/group.cpp
@@ -37,7 +37,7 @@ auto mGroup::objects() const -> vector<Object> {
 
 auto mGroup::remove(sObject object) -> type& {
   object->setGroup();
-  for(auto offset : range(state.objects)) {
+  for(auto offset : range(state.objects.size())) {
     if(auto shared = state.objects[offset].acquire()) {
       if(object == shared) {
         state.objects.remove(offset);
diff --git a/hiro/core/layout.cpp b/hiro/core/layout.cpp
deleted file mode 100644
index bb0518d0..00000000
--- a/hiro/core/layout.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-#if defined(Hiro_Layout)
-
-auto mLayout::allocate() -> pObject* {
-  return new pLayout(*this);
-}
-
-auto mLayout::destruct() -> void {
-  for(auto& sizable : state.sizables) sizable->destruct();
-  mSizable::destruct();
-}
-
-//
-
-auto mLayout::append(sSizable sizable) -> type& {
-  state.sizables.append(sizable);
-  sizable->setParent(this, sizableCount() - 1);
-  setGeometry(geometry());
-  return *this;
-}
-
-auto mLayout::remove() -> type& {
-  #if defined(Hiro_TabFrame)
-  if(auto tabFrameItem = parentTabFrameItem()) tabFrameItem->remove(tabFrameItem->layout());
-  #endif
-  if(auto layout = parentLayout()) layout->remove(layout->sizable(offset()));
-  if(auto window = parentWindow()) window->remove(window->layout());
-  setParent();
-  for(auto& sizable : state.sizables) sizable->setParent(this, sizable->offset());
-  return *this;
-}
-
-auto mLayout::remove(sSizable sizable) -> type& {
-  auto offset = sizable->offset();
-  sizable->setParent();
-  state.sizables.remove(offset);
-  for(auto n : range(offset, sizableCount())) {
-    state.sizables[n]->adjustOffset(-1);
-  }
-  setGeometry(geometry());
-  return *this;
-}
-
-auto mLayout::reset() -> type& {
-  while(state.sizables) remove(state.sizables.right());
-  return *this;
-}
-
-auto mLayout::setParent(mObject* parent, signed offset) -> type& {
-  for(auto& sizable : state.sizables) sizable->destruct();
-  mObject::setParent(parent, offset);
-  for(auto& sizable : state.sizables) sizable->setParent(this, sizable->offset());
-  return *this;
-}
-
-auto mLayout::sizable(unsigned position) const -> Sizable {
-  if(position < sizableCount()) return state.sizables[position];
-  return {};
-}
-
-auto mLayout::sizableCount() const -> unsigned {
-  return state.sizables.size();
-}
-
-auto mLayout::sizables() const -> vector<Sizable> {
-  vector<Sizable> sizables;
-  for(auto& sizable : sizables) sizables.append(sizable);
-  return sizables;
-}
-
-#endif
diff --git a/hiro/core/lock.hpp b/hiro/core/lock.hpp
new file mode 100644
index 00000000..9f6e4dde
--- /dev/null
+++ b/hiro/core/lock.hpp
@@ -0,0 +1,18 @@
+#pragma once
+
+//shared functionality used for pObject on all platforms
+
+struct mLock {
+  auto locked() const -> bool { return locks || Application::state.quit; }
+  auto lock() -> void { ++locks; }
+  auto unlock() -> void { --locks; }
+
+  struct Handle {
+    Handle(const mLock& self) : self(self) { ++self.locks; }
+    ~Handle() { --self.locks; }
+    const mLock& self;
+  };
+  auto acquire() const -> Handle { return {*this}; }
+
+  mutable int locks = 0;
+};
diff --git a/hiro/core/menu-bar.cpp b/hiro/core/menu-bar.cpp
index 280814be..958ad60b 100644
--- a/hiro/core/menu-bar.cpp
+++ b/hiro/core/menu-bar.cpp
@@ -55,7 +55,7 @@ auto mMenuBar::reset() -> type& {
 }
 
 auto mMenuBar::setParent(mObject* parent, signed offset) -> type& {
-  for(auto n : rrange(state.menus)) state.menus[n]->destruct();
+  for(auto& menu : reverse(state.menus)) menu->destruct();
   mObject::setParent(parent, offset);
   for(auto& menu : state.menus) menu->setParent(this, menu->offset());
   return *this;
diff --git a/hiro/core/object.cpp b/hiro/core/object.cpp
index cb29bbd4..ab919c95 100644
--- a/hiro/core/object.cpp
+++ b/hiro/core/object.cpp
@@ -26,7 +26,7 @@ auto mObject::destruct() -> void {
 
 //
 
-//used to test if returned items "exist" from eg Window::layout(), ListView::selected(), etc.
+//used to test if returned items "exist" from eg Window::sizable(), ListView::selected(), etc.
 mObject::operator bool() const {
   return parent() || !abstract();
 }
@@ -130,16 +130,6 @@ auto mObject::parentIconView(bool recursive) const -> mIconView* {
 }
 #endif
 
-#if defined(Hiro_Layout)
-auto mObject::parentLayout(bool recursive) const -> mLayout* {
-  if(auto layout = dynamic_cast<mLayout*>(parent())) return layout;
-  if(recursive) {
-    if(auto object = parent()) return object->parentLayout(true);
-  }
-  return nullptr;
-}
-#endif
-
 #if defined(Hiro_Menu)
 auto mObject::parentMenu(bool recursive) const -> mMenu* {
   if(auto menu = dynamic_cast<mMenu*>(parent())) return menu;
@@ -308,7 +298,8 @@ auto mObject::setGroup(sGroup group) -> type& {
   return *this;
 }
 
-auto mObject::setParent(mObject* parent, signed offset) -> type& {
+auto mObject::setParent(mObject* parent, int offset) -> type& {
+  signal(setParent, parent, offset);
   destruct();
   state.parent = parent;
   state.offset = offset;
diff --git a/hiro/core/popup-menu.cpp b/hiro/core/popup-menu.cpp
index f2a38798..400a39c8 100644
--- a/hiro/core/popup-menu.cpp
+++ b/hiro/core/popup-menu.cpp
@@ -50,7 +50,7 @@ auto mPopupMenu::reset() -> type& {
 }
 
 auto mPopupMenu::setParent(mObject* parent, signed offset) -> type& {
-  for(auto n : rrange(state.actions)) state.actions[n]->destruct();
+  for(auto& action : reverse(state.actions)) action->destruct();
   mObject::setParent(parent, offset);
   for(auto& action : state.actions) action->construct();
   return *this;
diff --git a/hiro/core/shared.hpp b/hiro/core/shared.hpp
index 284d3e37..6e3c9dd4 100644
--- a/hiro/core/shared.hpp
+++ b/hiro/core/shared.hpp
@@ -43,15 +43,6 @@
   auto minimumSize() const { return self().minimumSize(); } \
   auto setGeometry(Geometry geometry) { return self().setGeometry(geometry), *this; } \
 
-#define DeclareSharedLayout(Name) \
-  DeclareSharedSizable(Name) \
-  auto append(sSizable sizable) { return self().append(sizable), *this; } \
-  auto remove(sSizable sizable) { return self().remove(sizable), *this; } \
-  auto reset() { return self().reset(), *this; } \
-  auto sizable(unsigned position) { return self().sizable(position); } \
-  auto sizableCount() const { return self().sizableCount(); } \
-  auto sizables() const { return self().sizables(); } \
-
 #define DeclareSharedWidget(Name) \
   DeclareSharedSizable(Name) \
   auto doSize() const { return self().doSize(); } \
@@ -194,13 +185,6 @@ struct Sizable : sSizable {
 };
 #endif
 
-#if defined(Hiro_Layout)
-struct Layout : sLayout {
-  DeclareSharedLayout(Layout)
-  using internalType = mLayout;
-};
-#endif
-
 #if defined(Hiro_Widget)
 struct Widget : sWidget {
   DeclareSharedWidget(Widget)
@@ -382,11 +366,11 @@ struct Frame : sFrame {
   DeclareSharedWidget(Frame)
   using internalType = mFrame;
 
-  auto append(sLayout layout) { return self().append(layout), *this; }
-  auto layout() const { return self().layout(); }
-  auto remove(sLayout layout) { return self().remove(layout), *this; }
+  auto append(sSizable sizable) { return self().append(sizable), *this; }
+  auto remove(sSizable sizable) { return self().remove(sizable), *this; }
   auto reset() { return self().reset(), *this; }
   auto setText(const string& text = "") { return self().setText(text), *this; }
+  auto sizable() const { return self().sizable(); }
   auto text() const { return self().text(); }
 };
 #endif
@@ -594,12 +578,11 @@ struct TabFrameItem : sTabFrameItem {
   DeclareSharedObject(TabFrameItem)
   using internalType = mTabFrameItem;
 
-  auto append(sLayout layout) { return self().append(layout), *this; }
+  auto append(sSizable sizable) { return self().append(sizable), *this; }
   auto closable() const { return self().closable(); }
   auto icon() const { return self().icon(); }
-  auto layout() const { return self().layout(); }
   auto movable() const { return self().movable(); }
-  auto remove(sLayout layout) { return self().remove(layout), *this; }
+  auto remove(sSizable sizable) { return self().remove(sizable), *this; }
   auto reset() { return self().reset(), *this; }
   auto selected() const { return self().selected(); }
   auto setClosable(bool closable = true) { return self().setClosable(closable), *this; }
@@ -607,6 +590,7 @@ struct TabFrameItem : sTabFrameItem {
   auto setMovable(bool movable = true) { return self().setMovable(movable), *this; }
   auto setSelected() { return self().setSelected(), *this; }
   auto setText(const string& text = "") { return self().setText(text), *this; }
+  auto sizable() const { return self().sizable(); }
   auto text() const { return self().text(); }
 };
 #endif
@@ -940,8 +924,8 @@ struct Window : sWindow {
   DeclareSharedObject(Window)
   using internalType = mWindow;
 
-  auto append(sLayout layout) { return self().append(layout), *this; }
   auto append(sMenuBar menuBar) { return self().append(menuBar), *this; }
+  auto append(sSizable sizable) { return self().append(sizable), *this; }
   auto append(sStatusBar statusBar) { return self().append(statusBar), *this; }
   auto backgroundColor() const { return self().backgroundColor(); }
   auto dismissable() const { return self().dismissable(); }
@@ -955,7 +939,6 @@ struct Window : sWindow {
   auto frameGeometry() const { return self().frameGeometry(); }
   auto fullScreen() const { return self().fullScreen(); }
   auto geometry() const { return self().geometry(); }
-  auto layout() const { return self().layout(); }
   auto maximized() const { return self().maximized(); }
   auto maximumSize() const { return self().maximumSize(); }
   auto menuBar() const { return self().menuBar(); }
@@ -968,8 +951,8 @@ struct Window : sWindow {
   auto onKeyRelease(const function<void (signed)>& callback = {}) { return self().onKeyRelease(callback), *this; }
   auto onMove(const function<void ()>& callback = {}) { return self().onMove(callback), *this; }
   auto onSize(const function<void ()>& callback = {}) { return self().onSize(callback), *this; }
-  auto remove(sLayout layout) { return self().remove(layout), *this; }
   auto remove(sMenuBar menuBar) { return self().remove(menuBar), *this; }
+  auto remove(sSizable sizable) { return self().remove(sizable), *this; }
   auto remove(sStatusBar statusBar) { return self().remove(statusBar), *this; }
   auto reset() { return self().reset(), *this; }
   auto resizable() const { return self().resizable(); }
@@ -992,6 +975,7 @@ struct Window : sWindow {
   auto setResizable(bool resizable = true) { return self().setResizable(resizable), *this; }
   auto setSize(Size size) { return self().setSize(size), *this; }
   auto setTitle(const string& title = "") { return self().setTitle(title), *this; }
+  auto sizable() const { return self().sizable(); }
   auto statusBar() const { return self().statusBar(); }
   auto title() const { return self().title(); }
 };
diff --git a/hiro/core/widget/combo-edit.cpp b/hiro/core/widget/combo-edit.cpp
index 1a457c2c..374c7975 100644
--- a/hiro/core/widget/combo-edit.cpp
+++ b/hiro/core/widget/combo-edit.cpp
@@ -5,6 +5,7 @@ auto mComboEdit::allocate() -> pObject* {
 }
 
 auto mComboEdit::destruct() -> void {
+  for(auto& item : state.items) item->destruct();
   mWidget::destruct();
 }
 
diff --git a/hiro/core/widget/frame.cpp b/hiro/core/widget/frame.cpp
index e269c96c..e2b4558b 100644
--- a/hiro/core/widget/frame.cpp
+++ b/hiro/core/widget/frame.cpp
@@ -5,40 +5,36 @@ auto mFrame::allocate() -> pObject* {
 }
 
 auto mFrame::destruct() -> void {
-  if(auto& layout = state.layout) layout->destruct();
+  if(auto& sizable = state.sizable) sizable->destruct();
   mWidget::destruct();
 }
 
 //
 
-auto mFrame::append(sLayout layout) -> type& {
-  if(auto& layout = state.layout) remove(layout);
-  state.layout = layout;
-  layout->setParent(this, 0);
-  signal(append, layout);
+auto mFrame::append(sSizable sizable) -> type& {
+  if(auto& sizable = state.sizable) remove(sizable);
+  state.sizable = sizable;
+  sizable->setParent(this, 0);
+  signal(append, sizable);
   return *this;
 }
 
-auto mFrame::layout() const -> Layout {
-  return state.layout;
-}
-
-auto mFrame::remove(sLayout layout) -> type& {
-  signal(remove, layout);
-  layout->setParent();
-  state.layout.reset();
+auto mFrame::remove(sSizable sizable) -> type& {
+  signal(remove, sizable);
+  sizable->setParent();
+  state.sizable.reset();
   return *this;
 }
 
 auto mFrame::reset() -> type& {
-  if(auto& layout = state.layout) remove(layout);
+  if(auto& sizable = state.sizable) remove(sizable);
   return *this;
 }
 
-auto mFrame::setParent(mObject* object, signed offset) -> type& {
-  if(auto& layout = state.layout) layout->destruct();
+auto mFrame::setParent(mObject* object, int offset) -> type& {
+  if(auto& sizable = state.sizable) sizable->destruct();
   mObject::setParent(object, offset);
-  if(auto& layout = state.layout) layout->setParent(this, 0);
+  if(auto& sizable = state.sizable) sizable->setParent(this, 0);
   return *this;
 }
 
@@ -48,6 +44,10 @@ auto mFrame::setText(const string& text) -> type& {
   return *this;
 }
 
+auto mFrame::sizable() const -> Sizable {
+  return state.sizable;
+}
+
 auto mFrame::text() const -> string {
   return state.text;
 }
diff --git a/hiro/core/widget/icon-view.cpp b/hiro/core/widget/icon-view.cpp
index 9026c95d..a240e6b3 100644
--- a/hiro/core/widget/icon-view.cpp
+++ b/hiro/core/widget/icon-view.cpp
@@ -143,7 +143,7 @@ auto mIconView::setOrientation(Orientation orientation) -> type& {
 }
 
 auto mIconView::setParent(mObject* parent, signed offset) -> type& {
-  for(auto n : rrange(state.items)) state.items[n]->destruct();
+  for(auto& item : reverse(state.items)) item->destruct();
   mObject::setParent(parent, offset);
   for(auto& item : state.items) item->setParent(this, item->offset());
   return *this;
diff --git a/hiro/core/widget/tab-frame-item.cpp b/hiro/core/widget/tab-frame-item.cpp
index 2c6998f4..21566858 100644
--- a/hiro/core/widget/tab-frame-item.cpp
+++ b/hiro/core/widget/tab-frame-item.cpp
@@ -5,17 +5,17 @@ auto mTabFrameItem::allocate() -> pObject* {
 }
 
 auto mTabFrameItem::destruct() -> void {
-  if(auto& layout = state.layout) layout->destruct();
+  if(auto& sizable = state.sizable) sizable->destruct();
   mObject::destruct();
 }
 
 //
 
-auto mTabFrameItem::append(sLayout layout) -> type& {
-  if(auto& layout = state.layout) remove(layout);
-  state.layout = layout;
-  layout->setParent(this, 0);
-  signal(append, layout);
+auto mTabFrameItem::append(sSizable sizable) -> type& {
+  if(auto& sizable = state.sizable) remove(sizable);
+  state.sizable = sizable;
+  sizable->setParent(this, 0);
+  signal(append, sizable);
   return *this;
 }
 
@@ -27,10 +27,6 @@ auto mTabFrameItem::icon() const -> image {
   return state.icon;
 }
 
-auto mTabFrameItem::layout() const -> Layout {
-  return state.layout;
-}
-
 auto mTabFrameItem::movable() const -> bool {
   return state.movable;
 }
@@ -40,15 +36,15 @@ auto mTabFrameItem::remove() -> type& {
   return *this;
 }
 
-auto mTabFrameItem::remove(sLayout layout) -> type& {
-  signal(remove, layout);
-  state.layout.reset();
-  layout->setParent();
+auto mTabFrameItem::remove(sSizable sizable) -> type& {
+  signal(remove, sizable);
+  state.sizable.reset();
+  sizable->setParent();
   return *this;
 }
 
 auto mTabFrameItem::reset() -> type& {
-  if(auto layout = state.layout) remove(layout);
+  if(auto& sizable = state.sizable) remove(sizable);
   return *this;
 }
 
@@ -62,6 +58,18 @@ auto mTabFrameItem::setClosable(bool closable) -> type& {
   return *this;
 }
 
+auto mTabFrameItem::setEnabled(bool enabled) -> type& {
+  mObject::setEnabled(enabled);
+  if(auto& sizable = state.sizable) sizable->setEnabled(sizable->enabled());
+  return *this;
+}
+
+auto mTabFrameItem::setFont(const Font& font) -> type& {
+  mObject::setFont(font);
+  if(auto& sizable = state.sizable) sizable->setFont(sizable->font());
+  return *this;
+}
+
 auto mTabFrameItem::setIcon(const image& icon) -> type& {
   state.icon = icon;
   signal(setIcon, icon);
@@ -74,10 +82,10 @@ auto mTabFrameItem::setMovable(bool movable) -> type& {
   return *this;
 }
 
-auto mTabFrameItem::setParent(mObject* parent, signed offset) -> type& {
-  if(auto layout = state.layout) layout->destruct();
+auto mTabFrameItem::setParent(mObject* parent, int offset) -> type& {
+  if(auto& sizable = state.sizable) sizable->destruct();
   mObject::setParent(parent, offset);
-  if(auto layout = state.layout) layout->setParent(this, layout->offset());
+  if(auto& sizable = state.sizable) sizable->setParent(this, sizable->offset());
   return *this;
 }
 
@@ -96,6 +104,16 @@ auto mTabFrameItem::setText(const string& text) -> type& {
   return *this;
 }
 
+auto mTabFrameItem::setVisible(bool visible) -> type& {
+  mObject::setVisible(visible);
+  if(auto& sizable = state.sizable) sizable->setVisible(sizable->visible());
+  return *this;
+}
+
+auto mTabFrameItem::sizable() const -> Sizable {
+  return state.sizable;
+}
+
 auto mTabFrameItem::text() const -> string {
   return state.text;
 }
diff --git a/hiro/core/widget/tab-frame.cpp b/hiro/core/widget/tab-frame.cpp
index 58bbec78..59170a1a 100644
--- a/hiro/core/widget/tab-frame.cpp
+++ b/hiro/core/widget/tab-frame.cpp
@@ -32,8 +32,7 @@ auto mTabFrame::doMove(sTabFrameItem from, sTabFrameItem to) const -> void {
 }
 
 auto mTabFrame::item(unsigned position) const -> TabFrameItem {
-  if(position < itemCount()) return state.items[position];
-  return {};
+  return state.items(position, {});
 }
 
 auto mTabFrame::itemCount() const -> unsigned {
@@ -88,17 +87,35 @@ auto mTabFrame::selected() const -> TabFrameItem {
   return {};
 }
 
+auto mTabFrame::setEnabled(bool enabled) -> type& {
+  mWidget::setEnabled(enabled);
+  for(auto& item : state.items) item->setEnabled(item->enabled());
+  return *this;
+}
+
+auto mTabFrame::setFont(const Font& font) -> type& {
+  mWidget::setFont(font);
+  for(auto& item : state.items) item->setFont(item->font());
+  return *this;
+}
+
 auto mTabFrame::setNavigation(Navigation navigation) -> type& {
   state.navigation = navigation;
   signal(setNavigation, navigation);
   return *this;
 }
 
-auto mTabFrame::setParent(mObject* parent, signed offset) -> type& {
-  for(auto n : rrange(state.items)) state.items[n]->destruct();
+auto mTabFrame::setParent(mObject* parent, int offset) -> type& {
+  for(auto& item : reverse(state.items)) item->destruct();
   mObject::setParent(parent, offset);
   for(auto& item : state.items) item->setParent(this, item->offset());
   return *this;
 }
 
+auto mTabFrame::setVisible(bool visible) -> type& {
+  mWidget::setVisible(visible);
+  for(auto& item : state.items) item->setVisible(item->visible());
+  return *this;
+}
+
 #endif
diff --git a/hiro/core/widget/table-view-column.cpp b/hiro/core/widget/table-view-column.cpp
index f3f81966..06af8b84 100644
--- a/hiro/core/widget/table-view-column.cpp
+++ b/hiro/core/widget/table-view-column.cpp
@@ -6,8 +6,10 @@ auto mTableViewColumn::allocate() -> pObject* {
 
 //
 
+//TODO: active(), setActive() ... is this the best way to do this?
+
 auto mTableViewColumn::active() const -> bool {
-  if(auto tableView = parentTableView()) return tableView->state.activeColumn == offset();
+  if(auto tableView = parentTableView(true)) return tableView->state.activeColumn == offset();
   return false;
 }
 
@@ -40,7 +42,7 @@ auto mTableViewColumn::icon() const -> image {
 }
 
 auto mTableViewColumn::remove() -> type& {
-  if(auto tableView = parentTableViewHeader()) tableView->remove(*this);
+  if(auto tableViewHeader = parentTableViewHeader()) tableViewHeader->remove(*this);
   return *this;
 }
 
@@ -49,7 +51,7 @@ auto mTableViewColumn::resizable() const -> bool {
 }
 
 auto mTableViewColumn::setActive() -> type& {
-  if(auto tableView = parentTableView()) tableView->state.activeColumn = offset();
+  if(auto tableView = parentTableView(true)) tableView->state.activeColumn = offset();
   signal(setActive);
   return *this;
 }
diff --git a/hiro/core/widget/table-view-header.cpp b/hiro/core/widget/table-view-header.cpp
index cfc0dded..bb352314 100644
--- a/hiro/core/widget/table-view-header.cpp
+++ b/hiro/core/widget/table-view-header.cpp
@@ -4,6 +4,11 @@ auto mTableViewHeader::allocate() -> pObject* {
   return new pTableViewHeader(*this);
 }
 
+auto mTableViewHeader::destruct() -> void {
+  for(auto& column : state.columns) column->destruct();
+  mObject::destruct();
+}
+
 //
 
 auto mTableViewHeader::append(sTableViewColumn column) -> type& {
@@ -44,7 +49,7 @@ auto mTableViewHeader::remove(sTableViewColumn column) -> type& {
 }
 
 auto mTableViewHeader::reset() -> type& {
-  for(auto n : rrange(state.columns)) remove(state.columns[n]);
+  while(state.columns) remove(state.columns.right());
   return *this;
 }
 
diff --git a/hiro/core/widget/table-view-item.cpp b/hiro/core/widget/table-view-item.cpp
index 2fc8e2a6..bc01adc6 100644
--- a/hiro/core/widget/table-view-item.cpp
+++ b/hiro/core/widget/table-view-item.cpp
@@ -4,6 +4,11 @@ auto mTableViewItem::allocate() -> pObject* {
   return new pTableViewItem(*this);
 }
 
+auto mTableViewItem::destruct() -> void {
+  for(auto& cell : state.cells) cell->destruct();
+  mObject::destruct();
+}
+
 //
 
 auto mTableViewItem::alignment() const -> Alignment {
@@ -56,7 +61,7 @@ auto mTableViewItem::remove(sTableViewCell cell) -> type& {
 }
 
 auto mTableViewItem::reset() -> type& {
-  for(auto n : rrange(state.cells)) remove(state.cells[n]);
+  while(state.cells) remove(state.cells.right());
   return *this;
 }
 
diff --git a/hiro/core/widget/table-view.cpp b/hiro/core/widget/table-view.cpp
index 8390b625..6b40953e 100644
--- a/hiro/core/widget/table-view.cpp
+++ b/hiro/core/widget/table-view.cpp
@@ -146,7 +146,7 @@ auto mTableView::remove(sTableViewItem item) -> type& {
 }
 
 auto mTableView::reset() -> type& {
-  for(auto n : rrange(state.items)) remove(state.items[n]);
+  while(state.items) remove(state.items.right());
   if(auto& header = state.header) remove(header);
   return *this;
 }
@@ -194,7 +194,7 @@ auto mTableView::setForegroundColor(Color color) -> type& {
 }
 
 auto mTableView::setParent(mObject* parent, signed offset) -> type& {
-  for(auto n : rrange(state.items)) state.items[n]->destruct();
+  for(auto& item : reverse(state.items)) item->destruct();
   if(auto& header = state.header) header->destruct();
   mObject::setParent(parent, offset);
   if(auto& header = state.header) header->setParent(this, 0);
diff --git a/hiro/core/widget/tree-view-item.cpp b/hiro/core/widget/tree-view-item.cpp
index f26e9af9..c3e9ea8c 100644
--- a/hiro/core/widget/tree-view-item.cpp
+++ b/hiro/core/widget/tree-view-item.cpp
@@ -144,7 +144,7 @@ auto mTreeViewItem::setIcon(const image& icon) -> type& {
 }
 
 auto mTreeViewItem::setParent(mObject* parent, signed offset) -> type& {
-  for(auto n : rrange(state.items)) state.items[n]->destruct();
+  for(auto& item : reverse(state.items)) item->destruct();
   mObject::setParent(parent, offset);
   for(auto& item : state.items) item->setParent(this, item->offset());
 }
diff --git a/hiro/core/widget/tree-view.cpp b/hiro/core/widget/tree-view.cpp
index 006608c7..ce0455b3 100644
--- a/hiro/core/widget/tree-view.cpp
+++ b/hiro/core/widget/tree-view.cpp
@@ -93,7 +93,7 @@ auto mTreeView::remove(sTreeViewItem item) -> type& {
 
 auto mTreeView::reset() -> type& {
   state.selectedPath.reset();
-  for(auto n : rrange(state.items)) remove(state.items[n]);
+  while(state.items) remove(state.items.right());
   return *this;
 }
 
@@ -114,7 +114,7 @@ auto mTreeView::setForegroundColor(Color color) -> type& {
 }
 
 auto mTreeView::setParent(mObject* object, signed offset) -> type& {
-  for(auto n : rrange(state.items)) state.items[n]->destruct();
+  for(auto& item : reverse(state.items)) item->destruct();
   mObject::setParent(object, offset);
   for(auto& item : state.items) item->setParent(this, item->offset());
   return *this;
diff --git a/hiro/core/widget/widget.cpp b/hiro/core/widget/widget.cpp
index 3cf4a292..2292cfde 100644
--- a/hiro/core/widget/widget.cpp
+++ b/hiro/core/widget/widget.cpp
@@ -16,7 +16,8 @@ auto mWidget::onSize(const function<void ()>& callback) -> type& {
 }
 
 auto mWidget::remove() -> type& {
-  if(auto layout = parentLayout()) layout->remove(layout->sizable(offset()));
+//TODO: how to implement this after removing mLayout?
+//if(auto layout = parentLayout()) layout->remove(layout->sizable(offset()));
   setParent();
   return *this;
 }
diff --git a/hiro/core/window.cpp b/hiro/core/window.cpp
index e7b083a9..9c5f1a78 100644
--- a/hiro/core/window.cpp
+++ b/hiro/core/window.cpp
@@ -1,28 +1,22 @@
 #if defined(Hiro_Window)
 
+mWindow::mWindow() {
+  mObject::state.visible = false;
+}
+
 auto mWindow::allocate() -> pObject* {
   return new pWindow(*this);
 }
 
 auto mWindow::destruct() -> void {
-  if(auto& layout = state.layout) layout->destruct();
   if(auto& menuBar = state.menuBar) menuBar->destruct();
+  if(auto& sizable = state.sizable) sizable->destruct();
   if(auto& statusBar = state.statusBar) statusBar->destruct();
   mObject::destruct();
 }
 
 //
 
-auto mWindow::append(sLayout layout) -> type& {
-  if(auto& layout = state.layout) remove(layout);
-  state.layout = layout;
-  layout->setGeometry(geometry().setPosition(0, 0));
-  layout->setParent(this, 0);
-  layout->setGeometry(geometry().setPosition(0, 0));
-  signal(append, layout);
-  return *this;
-}
-
 auto mWindow::append(sMenuBar menuBar) -> type& {
   if(auto& menuBar = state.menuBar) remove(menuBar);
   menuBar->setParent(this, 0);
@@ -31,6 +25,14 @@ auto mWindow::append(sMenuBar menuBar) -> type& {
   return *this;
 }
 
+auto mWindow::append(sSizable sizable) -> type& {
+  if(auto& sizable = state.sizable) remove(sizable);
+  state.sizable = sizable;
+  sizable->setParent(this, 0);
+  signal(append, sizable);
+  return *this;
+}
+
 auto mWindow::append(sStatusBar statusBar) -> type& {
   if(auto& statusBar = state.statusBar) remove(statusBar);
   statusBar->setParent(this, 0);
@@ -91,10 +93,6 @@ auto mWindow::geometry() const -> Geometry {
   return state.geometry;
 }
 
-auto mWindow::layout() const -> Layout {
-  return state.layout;
-}
-
 auto mWindow::maximized() const -> bool {
   return state.maximized;
 }
@@ -149,18 +147,17 @@ auto mWindow::onSize(const function<void ()>& callback) -> type& {
   return *this;
 }
 
-auto mWindow::remove(sLayout layout) -> type& {
-  signal(remove, layout);
-  layout->setParent();
-  state.layout.reset();
+auto mWindow::remove(sMenuBar menuBar) -> type& {
+  signal(remove, menuBar);
+  menuBar->setParent();
+  state.menuBar.reset();
   return *this;
 }
 
-auto mWindow::remove(sMenuBar menuBar) -> type& {
-  signal(remove, menuBar);
-  menuBar->reset();
-  menuBar->setParent();
-  state.menuBar.reset();
+auto mWindow::remove(sSizable sizable) -> type& {
+  signal(remove, sizable);
+  sizable->setParent();
+  state.sizable.reset();
   return *this;
 }
 
@@ -172,8 +169,8 @@ auto mWindow::remove(sStatusBar statusBar) -> type& {
 }
 
 auto mWindow::reset() -> type& {
-  if(auto& layout = state.layout) remove(layout);
   if(auto& menuBar = state.menuBar) remove(menuBar);
+  if(auto& sizable = state.sizable) remove(sizable);
   if(auto& statusBar = state.statusBar) remove(statusBar);
   return *this;
 }
@@ -255,9 +252,7 @@ auto mWindow::setFullScreen(bool fullScreen) -> type& {
 auto mWindow::setGeometry(Geometry geometry) -> type& {
   state.geometry = geometry;
   signal(setGeometry, geometry);
-  if(auto& layout = state.layout) {
-    layout->setGeometry(geometry.setPosition(0, 0));
-  }
+  if(auto& sizable = state.sizable) sizable->setGeometry(sizable->geometry());
   return *this;
 }
 
@@ -323,6 +318,18 @@ auto mWindow::setTitle(const string& title) -> type& {
   return *this;
 }
 
+auto mWindow::setVisible(bool visible) -> type& {
+  mObject::setVisible(visible);
+  if(auto& menuBar = state.menuBar) menuBar->setVisible(menuBar->visible());
+  if(auto& sizable = state.sizable) sizable->setVisible(sizable->visible());
+  if(auto& statusBar = state.statusBar) statusBar->setVisible(statusBar->visible());
+  return *this;
+}
+
+auto mWindow::sizable() const -> Sizable {
+  return state.sizable;
+}
+
 auto mWindow::statusBar() const -> StatusBar {
   return state.statusBar;
 }
diff --git a/hiro/extension/browser-dialog.cpp b/hiro/extension/browser-dialog.cpp
index ed0f1f6c..c74ddf70 100644
--- a/hiro/extension/browser-dialog.cpp
+++ b/hiro/extension/browser-dialog.cpp
@@ -149,7 +149,7 @@ auto BrowserDialogWindow::isMatch(const string& name) -> bool {
 auto BrowserDialogWindow::run() -> BrowserDialog::Response {
   response = {};
 
-  layout.setMargin(5);
+  layout.setPadding(5);
   pathName.onActivate([&] { setPath(pathName.text()); });
   pathRefresh.setBordered(false).setIcon(Icon::Action::Refresh).onActivate([&] { setPath(state.path); });
   pathHome.setBordered(false).setIcon(Icon::Go::Home).onActivate([&] { setPath(Path::user()); });
diff --git a/hiro/extension/extension.cpp b/hiro/extension/extension.cpp
index a18e44c6..7b2d67b5 100644
--- a/hiro/extension/extension.cpp
+++ b/hiro/extension/extension.cpp
@@ -6,7 +6,7 @@ namespace hiro {
   #include "fixed-layout.cpp"
   #include "horizontal-layout.cpp"
   #include "vertical-layout.cpp"
-  #include "list-view-item.cpp"
+  #include "table-layout.cpp"
   #include "list-view.cpp"
   #include "browser-dialog.cpp"
   #include "message-dialog.cpp"
diff --git a/hiro/extension/extension.hpp b/hiro/extension/extension.hpp
index 3f20bf8e..9639feb2 100644
--- a/hiro/extension/extension.hpp
+++ b/hiro/extension/extension.hpp
@@ -3,7 +3,7 @@ namespace hiro {
   #include "fixed-layout.hpp"
   #include "horizontal-layout.hpp"
   #include "vertical-layout.hpp"
-  #include "list-view-item.hpp"
+  #include "table-layout.hpp"
   #include "list-view.hpp"
   #include "shared.hpp"
   #include "browser-dialog.hpp"
diff --git a/hiro/extension/fixed-layout.cpp b/hiro/extension/fixed-layout.cpp
index e2be026e..4e269e08 100644
--- a/hiro/extension/fixed-layout.cpp
+++ b/hiro/extension/fixed-layout.cpp
@@ -1,61 +1,142 @@
 #if defined(Hiro_FixedLayout)
 
 auto mFixedLayout::append(sSizable sizable, Geometry geometry) -> type& {
-  properties.append({geometry});
-  mLayout::append(sizable);
-  sizable->setGeometry(geometry);
-  return *this;
+  FixedLayoutCell cell;
+  cell->setSizable(sizable);
+  cell->setGeometry(geometry);
+  cell->setParent(this, cellCount());
+  state.cells.append(cell);
+  return synchronize();
 }
 
-auto mFixedLayout::modify(sSizable sizable, Geometry geometry) -> type& {
-  if(sizable && this->sizable(sizable->offset()) == sizable) {
-    auto& properties = this->properties[sizable->offset()];
-    properties.geometry = geometry;
+auto mFixedLayout::cell(uint position) const -> FixedLayoutCell {
+  return state.cells(position, {});
+}
+
+auto mFixedLayout::cell(sSizable sizable) const -> FixedLayoutCell {
+  for(auto& cell : state.cells) {
+    if(cell->state.sizable == sizable) return cell;
   }
-  return *this;
+  return {};
+}
+
+auto mFixedLayout::cellCount() const -> uint {
+  return state.cells.size();
+}
+
+auto mFixedLayout::destruct() -> void {
+  for(auto& cell : state.cells) cell->destruct();
+  return mSizable::destruct();
 }
 
 auto mFixedLayout::minimumSize() const -> Size {
-  float width = Size::Minimum, height = Size::Minimum;
-  for(auto n : range(sizableCount())) {
-    width  = max(width,  sizable(n)->minimumSize().width());
-    height = max(height, sizable(n)->minimumSize().height());
+  float width = 0, height = 0;
+  for(auto& cell : state.cells) {
+    width  = max(width,  cell.sizable().minimumSize().width());
+    height = max(height, cell.sizable().minimumSize().height());
   }
   return {width, height};
 }
 
-auto mFixedLayout::remove(sSizable sizable) -> type& {
-  properties.remove(sizable->offset());
-  mLayout::remove(sizable);
-  return *this;
+auto mFixedLayout::remove(sFixedLayoutCell cell) -> type& {
+  if(cell->parent() != this) return *this;
+  auto offset = cell->offset();
+  cell->setParent();
+  state.cells.remove(offset);
+  for(uint n : range(offset, cellCount())) state.cells[n]->adjustOffset(-1);
+  return synchronize();
 }
 
 auto mFixedLayout::reset() -> type& {
-  mLayout::reset();
-  properties.reset();
-  return *this;
+  while(state.cells) remove(state.cells.right());
+  return synchronize();
 }
 
 auto mFixedLayout::setEnabled(bool enabled) -> type& {
-  mLayout::setEnabled(enabled);
-  for(auto n : range(sizableCount())) {
-    sizable(n)->setEnabled(sizable(n)->enabled());
-  }
+  mSizable::setEnabled(enabled);
+  for(auto& cell : state.cells) cell.sizable().setEnabled(cell.sizable().enabled());
   return *this;
 }
 
 auto mFixedLayout::setFont(const Font& font) -> type& {
-  mLayout::setFont(font);
-  for(auto n : range(sizableCount())) {
-    sizable(n)->setFont(sizable(n)->font());
-  }
+  mSizable::setFont(font);
+  for(auto& cell : state.cells) cell.sizable().setFont(cell.sizable().font());
+  return *this;
+}
+
+auto mFixedLayout::setParent(mObject* parent, int offset) -> type& {
+  for(auto& cell : reverse(state.cells)) cell->destruct();
+  mSizable::setParent(parent, offset);
+  for(auto& cell : state.cells) cell->setParent(this, cell->offset());
   return *this;
 }
 
 auto mFixedLayout::setVisible(bool visible) -> type& {
-  mLayout::setVisible(visible);
-  for(auto n : range(sizableCount())) {
-    sizable(n)->setVisible(sizable(n)->visible());
+  mSizable::setVisible(visible);
+  for(auto& cell : state.cells) cell.sizable().setVisible(cell.sizable().visible());
+  return synchronize();
+}
+
+auto mFixedLayout::synchronize() -> type& {
+  setGeometry(geometry());
+  return *this;
+}
+
+//
+
+auto mFixedLayoutCell::destruct() -> void {
+  if(auto& sizable = state.sizable) sizable->destruct();
+  mObject::destruct();
+}
+
+auto mFixedLayoutCell::geometry() const -> Geometry {
+  return state.geometry;
+}
+
+auto mFixedLayoutCell::setEnabled(bool enabled) -> type& {
+  mObject::setEnabled(enabled);
+  state.sizable->setEnabled(state.sizable->enabled());
+  return *this;
+}
+
+auto mFixedLayoutCell::setFont(const Font& font) -> type& {
+  mObject::setFont(font);
+  state.sizable->setFont(state.sizable->font());
+  return *this;
+}
+
+auto mFixedLayoutCell::setGeometry(Geometry geometry) -> type& {
+  state.geometry = geometry;
+  return synchronize();
+}
+
+auto mFixedLayoutCell::setParent(mObject* parent, int offset) -> type& {
+  state.sizable->destruct();
+  mObject::setParent(parent, offset);
+  state.sizable->setParent(this, 0);
+  return *this;
+}
+
+auto mFixedLayoutCell::setSizable(sSizable sizable) -> type& {
+  state.sizable = sizable;
+  return synchronize();
+}
+
+auto mFixedLayoutCell::setVisible(bool visible) -> type& {
+  mObject::setVisible(visible);
+  state.sizable->setVisible(state.sizable->visible());
+  return *this;
+}
+
+auto mFixedLayoutCell::sizable() const -> Sizable {
+  return state.sizable;
+}
+
+auto mFixedLayoutCell::synchronize() -> type& {
+  if(auto parent = this->parent()) {
+    if(auto fixedLayout = dynamic_cast<mFixedLayout*>(parent)) {
+      fixedLayout->synchronize();
+    }
   }
   return *this;
 }
diff --git a/hiro/extension/fixed-layout.hpp b/hiro/extension/fixed-layout.hpp
index dbcf350f..45649ebf 100644
--- a/hiro/extension/fixed-layout.hpp
+++ b/hiro/extension/fixed-layout.hpp
@@ -1,23 +1,61 @@
 #if defined(Hiro_FixedLayout)
 
-struct mFixedLayout : mLayout {
+struct FixedLayout;
+struct FixedLayoutCell;
+
+struct mFixedLayout;
+struct mFixedLayoutCell;
+
+using sFixedLayout = shared_pointer<mFixedLayout>;
+using sFixedLayoutCell = shared_pointer<mFixedLayoutCell>;
+
+struct mFixedLayout : mSizable {
   using type = mFixedLayout;
-  using mLayout::append;
-  using mLayout::remove;
+  using mSizable::remove;
 
   auto append(sSizable sizable, Geometry geometry) -> type&;
-  auto modify(sSizable sizable, Geometry geometry) -> type&;
+  auto cell(uint position) const -> FixedLayoutCell;
+  auto cell(sSizable sizable) const -> FixedLayoutCell;
+  auto cellCount() const -> uint;
   auto minimumSize() const -> Size override;
-  auto remove(sSizable sizable) -> type& override;
+  auto remove(sFixedLayoutCell cell) -> type&;
   auto reset() -> type& override;
-  auto setEnabled(bool enabled = true) -> type& override;
-  auto setFont(const Font& font = {}) -> type& override;
-  auto setVisible(bool visible = true) ->type& override;
+  auto setEnabled(bool enabled) -> type& override;
+  auto setFont(const Font& font) -> type& override;
+  auto setParent(mObject* parent = nullptr, int offset = -1) -> type& override;
+  auto setVisible(bool visible) ->type& override;
+  auto synchronize() -> type&;
 
-  struct Property {
+private:
+  auto destruct() -> void override;
+
+  struct State {
+    vector<FixedLayoutCell> cells;
+  } state;
+};
+
+struct mFixedLayoutCell : mObject {
+  using type = mFixedLayoutCell;
+
+  auto geometry() const -> Geometry;
+  auto setEnabled(bool enabled) -> type& override;
+  auto setFont(const Font& font) -> type& override;
+  auto setGeometry(Geometry geometry) -> type&;
+  auto setParent(mObject* parent = nullptr, int offset = -1) -> type& override;
+  auto setSizable(sSizable sizable) -> type&;
+  auto setVisible(bool visible) -> type& override;
+  auto sizable() const -> Sizable;
+  auto synchronize() -> type&;
+
+private:
+  auto destruct() -> void override;
+
+  struct State {
     Geometry geometry;
-  };
-  vector<Property> properties;
+    sSizable sizable;
+  } state;
+
+  friend class mFixedLayout;
 };
 
 #endif
diff --git a/hiro/extension/horizontal-layout.cpp b/hiro/extension/horizontal-layout.cpp
index 94b78bd5..17f32d10 100644
--- a/hiro/extension/horizontal-layout.cpp
+++ b/hiro/extension/horizontal-layout.cpp
@@ -1,149 +1,280 @@
 #if defined(Hiro_HorizontalLayout)
 
-auto mHorizontalLayout::append(sSizable sizable, Size size, float spacing) -> type& {
-  properties.append({size.width(), size.height(), spacing < 0 ? settings.spacing : spacing});
-  mLayout::append(sizable);
-  return *this;
+auto mHorizontalLayout::alignment() const -> maybe<float> {
+  return state.alignment;
 }
 
-auto mHorizontalLayout::modify(sSizable sizable, Size size, float spacing) -> type& {
-  if(sizable && this->sizable(sizable->offset()) == sizable) {
-    auto& properties = this->properties[sizable->offset()];
-    properties.setWidth(size.width());
-    properties.setHeight(size.height());
-    properties.setSpacing(spacing);
+auto mHorizontalLayout::append(sSizable sizable, Size size, float spacing) -> type& {
+  HorizontalLayoutCell cell;
+  cell->setSizable(sizable);
+  cell->setSize(size);
+  cell->setSpacing(spacing);
+  cell->setParent(this, cellCount());
+  state.cells.append(cell);
+  return synchronize();
+}
+
+auto mHorizontalLayout::cell(uint position) const -> HorizontalLayoutCell {
+  return state.cells(position, {});
+}
+
+auto mHorizontalLayout::cell(sSizable sizable) const -> HorizontalLayoutCell {
+  for(auto& cell : state.cells) {
+    if(cell->state.sizable == sizable) return cell;
   }
-  return *this;
+  return {};
+}
+
+auto mHorizontalLayout::cellCount() const -> uint {
+  return state.cells.size();
+}
+
+auto mHorizontalLayout::destruct() -> void {
+  for(auto& cell : state.cells) cell->destruct();
+  mSizable::destruct();
 }
 
 auto mHorizontalLayout::minimumSize() const -> Size {
-  float width = 0, height = 0;
-
-  for(auto n : range(sizableCount())) {
-    auto& child = properties[sizable(n)->offset()];
-    if(child.width() == Size::Minimum || child.width() == Size::Maximum) {
-      width += sizable(n)->minimumSize().width();
+  float width = 0;
+  for(auto index : range(cellCount())) {
+    auto cell = this->cell(index);
+    if(cell.size().width() == Size::Minimum || cell.size().width() == Size::Maximum) {
+      width += cell.sizable().minimumSize().width();
     } else {
-      width += child.width();
+      width += cell.size().width();
     }
-    if(&child != &properties.right()) width += child.spacing();
+    if(index != cellCount() - 1) width += cell.spacing();
   }
 
-  for(auto n : range(sizableCount())) {
-    auto& child = properties[sizable(n)->offset()];
-    if(child.height() == Size::Minimum || child.height() == Size::Maximum) {
-      height = max(height, sizable(n)->minimumSize().height());
+  float height = 0;
+  for(auto index : range(cellCount())) {
+    auto cell = this->cell(index);
+    if(cell.size().height() == Size::Minimum || cell.size().height() == Size::Maximum) {
+      height = max(height, cell.sizable().minimumSize().height());
       continue;
     }
-    height = max(height, child.height());
+    height = max(height, cell.size().height());
   }
 
   return {
-    settings.padding.x() + width  + settings.padding.width(),
-    settings.padding.y() + height + settings.padding.height()
+    padding().x() + width  + padding().width(),
+    padding().y() + height + padding().height()
   };
 }
 
-auto mHorizontalLayout::remove(sSizable sizable) -> type& {
-  properties.remove(sizable->offset());
-  mLayout::remove(sizable);
-  return *this;
+auto mHorizontalLayout::padding() const -> Geometry {
+  return state.padding;
+}
+
+auto mHorizontalLayout::remove(sHorizontalLayoutCell cell) -> type& {
+  if(cell->parent() != this) return *this;
+  auto offset = cell->offset();
+  cell->setParent();
+  state.cells.remove(offset);
+  for(uint n : range(offset, cellCount())) state.cells[n]->adjustOffset(-1);
+  return synchronize();
 }
 
 auto mHorizontalLayout::reset() -> type& {
-  mLayout::reset();
-  properties.reset();
-  return *this;
+  while(state.cells) remove(state.cells.right());
+  return synchronize();
 }
 
-auto mHorizontalLayout::setAlignment(float alignment) -> type& {
-  settings.alignment = max(0.0, min(1.0, alignment));
-  return *this;
+auto mHorizontalLayout::setAlignment(maybe<float> alignment) -> type& {
+  state.alignment = alignment;
+  return synchronize();
 }
 
 auto mHorizontalLayout::setEnabled(bool enabled) -> type& {
-  mLayout::setEnabled(enabled);
-  for(auto n : range(sizableCount())) {
-    sizable(n)->setEnabled(sizable(n)->enabled());
-  }
+  mSizable::setEnabled(enabled);
+  for(auto& cell : state.cells) cell.sizable().setEnabled(cell.sizable().enabled());
   return *this;
 }
 
 auto mHorizontalLayout::setFont(const Font& font) -> type& {
-  mLayout::setFont(font);
-  for(auto n : range(sizableCount())) {
-    sizable(n)->setFont(sizable(n)->font());
-  }
+  mSizable::setFont(font);
+  for(auto& cell : state.cells) cell.sizable().setFont(cell.sizable().font());
   return *this;
 }
 
-auto mHorizontalLayout::setGeometry(Geometry containerGeometry) -> type& {
-  mLayout::setGeometry(containerGeometry);
+auto mHorizontalLayout::setGeometry(Geometry geometry) -> type& {
+  mSizable::setGeometry(geometry);
+  auto window = parentWindow(true);
+  if(!window || !window->visible()) return *this;
 
-  auto properties = this->properties;
-  for(auto n : range(sizableCount())) {
-    auto& child = properties[sizable(n)->offset()];
-    if(child.width()  == Size::Minimum) child.setWidth(sizable(n)->minimumSize().width());
-    if(child.height() == Size::Minimum) child.setHeight(sizable(n)->minimumSize().height());
+  geometry.setX(geometry.x() + padding().x());
+  geometry.setY(geometry.y() + padding().y());
+  geometry.setWidth (geometry.width()  - padding().x() - padding().width());
+  geometry.setHeight(geometry.height() - padding().y() - padding().height());
+
+  vector<float> widths;
+  widths.resize(cellCount());
+  uint maximumWidths = 0;
+  for(auto index : range(cellCount())) {
+    auto cell = this->cell(index);
+    float width = 0;
+    if(cell.size().width() == Size::Maximum) {
+      width = Size::Maximum;
+      maximumWidths++;
+    } else if(cell.size().width() == Size::Minimum) {
+      width = cell.sizable().minimumSize().width();
+    } else {
+      width = cell.size().width();
+    }
+    widths[index] = width;
   }
 
-  Geometry geometry = containerGeometry;
-  geometry.setX     (geometry.x()      + settings.padding.x());
-  geometry.setY     (geometry.y()      + settings.padding.y());
-  geometry.setWidth (geometry.width()  - settings.padding.x() - settings.padding.width());
-  geometry.setHeight(geometry.height() - settings.padding.y() - settings.padding.height());
-
-  float minimumWidth = 0, maximumWidthCounter = 0;
-  for(auto& child : properties) {
-    if(child.width() == Size::Maximum) maximumWidthCounter++;
-    if(child.width() != Size::Maximum) minimumWidth += child.width();
-    if(&child != &properties.right()) minimumWidth += child.spacing();
+  float fixedWidth = 0;
+  for(uint index : range(state.cells.size())) {
+    if(widths[index] != Size::Maximum) fixedWidth += widths[index];
+    if(index != cellCount() - 1) fixedWidth += cell(index).spacing();
   }
 
-  for(auto& child : properties) {
-    if(child.width()  == Size::Maximum) child.setWidth((geometry.width() - minimumWidth) / maximumWidthCounter);
-    if(child.height() == Size::Maximum) child.setHeight(geometry.height());
+  float maximumWidth = (geometry.width() - fixedWidth) / maximumWidths;
+  for(auto& width : widths) {
+    if(width == Size::Maximum) width = maximumWidth;
   }
 
-  float maximumHeight = 0;
-  for(auto& child : properties) maximumHeight = max(maximumHeight, child.height());
-
-  for(auto n : range(sizableCount())) {
-    auto& child = properties[sizable(n)->offset()];
-    float pivot = (maximumHeight - child.height()) * settings.alignment;
-    Geometry childGeometry = {geometry.x(), geometry.y() + pivot, child.width(), child.height()};
-    if(childGeometry.width()  < 1) childGeometry.setWidth (1);
-    if(childGeometry.height() < 1) childGeometry.setHeight(1);
-    sizable(n)->setGeometry(childGeometry);
-
-    geometry.setX    (geometry.x()     + child.width() + child.spacing());
-    geometry.setWidth(geometry.width() - child.width() + child.spacing());
+  float height = 0;
+  for(auto index : range(cellCount())) {
+    auto cell = this->cell(index);
+    if(cell.size().height() == Size::Maximum) {
+      height = geometry.height();
+      break;
+    } else if(cell.size().height() == Size::Minimum) {
+      height = max(height, cell.sizable().minimumSize().height());
+    } else {
+      height = max(height, cell.size().height());
+    }
   }
 
-  return *this;
-}
+  float geometryX = geometry.x();
+  float geometryY = geometry.y();
+  for(auto index : range(cellCount())) {
+    float geometryWidth  = widths[index];
+    float geometryHeight = height;
+    auto cell = this->cell(index);
+    auto alignment = cell.alignment();
+    if(!alignment) alignment = this->alignment();
+    if(!alignment) alignment = 0.5;
+    float cellWidth  = geometryWidth;
+    float cellHeight = cell.size().height();
+    if(cellHeight == Size::Minimum) cellHeight = cell.sizable()->minimumSize().height();
+    if(cellHeight == Size::Maximum) cellHeight = geometryHeight;
+    float cellX = geometryX;
+    float cellY = geometryY + alignment() * (geometryHeight - cellHeight);
+    cell.sizable().setGeometry({cellX, cellY, cellWidth, cellHeight});
+    geometryX += geometryWidth + cell.spacing();
+  }
 
-auto mHorizontalLayout::setMargin(float margin) -> type& {
-  setPadding({margin, margin, margin, margin});
   return *this;
 }
 
 auto mHorizontalLayout::setPadding(Geometry padding) -> type& {
-  settings.padding = padding;
-  setGeometry(geometry());
+  state.padding = padding;
+  return synchronize();
+}
+
+auto mHorizontalLayout::setParent(mObject* parent, int offset) -> type& {
+  for(auto& cell : reverse(state.cells)) cell->destruct();
+  mSizable::setParent(parent, offset);
+  for(auto& cell : state.cells) cell->setParent(this, cell->offset());
   return *this;
 }
 
 auto mHorizontalLayout::setSpacing(float spacing) -> type& {
-  settings.spacing = spacing;
+  state.spacing = spacing;
+  return synchronize();
+}
+
+auto mHorizontalLayout::setVisible(bool visible) -> type& {
+  mSizable::setVisible(visible);
+  for(auto& cell : state.cells) cell.sizable().setVisible(cell.sizable().visible());
+  return synchronize();
+}
+
+auto mHorizontalLayout::spacing() const -> float {
+  return state.spacing;
+}
+
+auto mHorizontalLayout::synchronize() -> type& {
   setGeometry(geometry());
   return *this;
 }
 
-auto mHorizontalLayout::setVisible(bool visible) -> type& {
-  mLayout::setVisible(visible);
-  for(auto n : range(sizableCount())) {
-    sizable(n)->setVisible(sizable(n)->visible());
+//
+
+auto mHorizontalLayoutCell::alignment() const -> maybe<float> {
+  return state.alignment;
+}
+
+auto mHorizontalLayoutCell::destruct() -> void {
+  if(auto& sizable = state.sizable) sizable->destruct();
+  mObject::destruct();
+}
+
+auto mHorizontalLayoutCell::setAlignment(maybe<float> alignment) -> type& {
+  state.alignment = alignment;
+  return synchronize();
+}
+
+auto mHorizontalLayoutCell::setEnabled(bool enabled) -> type& {
+  mObject::setEnabled(enabled);
+  state.sizable->setEnabled(state.sizable->enabled());
+  return *this;
+}
+
+auto mHorizontalLayoutCell::setFont(const Font& font) -> type& {
+  mObject::setFont(font);
+  state.sizable->setFont(state.sizable->font());
+  return *this;
+}
+
+auto mHorizontalLayoutCell::setParent(mObject* parent, int offset) -> type& {
+  state.sizable->destruct();
+  mObject::setParent(parent, offset);
+  state.sizable->setParent(this, 0);
+  return *this;
+}
+
+auto mHorizontalLayoutCell::setSizable(sSizable sizable) -> type& {
+  state.sizable = sizable;
+  return synchronize();
+}
+
+auto mHorizontalLayoutCell::setSize(Size size) -> type& {
+  state.size = size;
+  return synchronize();
+}
+
+auto mHorizontalLayoutCell::setSpacing(float spacing) -> type& {
+  state.spacing = spacing;
+  return synchronize();
+}
+
+auto mHorizontalLayoutCell::setVisible(bool visible) -> type& {
+  mObject::setVisible(visible);
+  state.sizable->setVisible(state.sizable->visible());
+  return *this;
+}
+
+auto mHorizontalLayoutCell::sizable() const -> Sizable {
+  return state.sizable;
+}
+
+auto mHorizontalLayoutCell::size() const -> Size {
+  return state.size;
+}
+
+auto mHorizontalLayoutCell::spacing() const -> float {
+  return state.spacing;
+}
+
+auto mHorizontalLayoutCell::synchronize() -> type& {
+  if(auto parent = this->parent()) {
+    if(auto horizontalLayout = dynamic_cast<mHorizontalLayout*>(parent)) {
+      horizontalLayout->synchronize();
+    }
   }
   return *this;
 }
diff --git a/hiro/extension/horizontal-layout.hpp b/hiro/extension/horizontal-layout.hpp
index 25c49923..196fbf2b 100644
--- a/hiro/extension/horizontal-layout.hpp
+++ b/hiro/extension/horizontal-layout.hpp
@@ -1,38 +1,77 @@
 #if defined(Hiro_HorizontalLayout)
 
-struct mHorizontalLayout : mLayout {
+struct HorizontalLayout;
+struct HorizontalLayoutCell;
+
+struct mHorizontalLayout;
+struct mHorizontalLayoutCell;
+
+using sHorizontalLayout = shared_pointer<mHorizontalLayout>;
+using sHorizontalLayoutCell = shared_pointer<mHorizontalLayoutCell>;
+
+struct mHorizontalLayout : mSizable {
   using type = mHorizontalLayout;
-  using mLayout::append;
-  using mLayout::remove;
+  using mSizable::remove;
 
+  auto alignment() const -> maybe<float>;
   auto append(sSizable sizable, Size size, float spacing = 5) -> type&;
+  auto cell(uint position) const -> HorizontalLayoutCell;
+  auto cell(sSizable sizable) const -> HorizontalLayoutCell;
+  auto cellCount() const -> uint;
   auto minimumSize() const -> Size override;
-  auto modify(sSizable sizable, Size size, float spacing = 5) -> type&;
-  auto remove(sSizable sizable) -> type& override;
+  auto padding() const -> Geometry;
+  auto remove(sHorizontalLayoutCell cell) -> type&;
   auto reset() -> type& override;
-  auto setAlignment(float alignment = 0.5) -> type&;
-  auto setEnabled(bool enabled = true) -> type& override;
-  auto setFont(const Font& font = {}) -> type& override;
+  auto setAlignment(maybe<float> alignment) -> type&;
+  auto setEnabled(bool enabled) -> type& override;
+  auto setFont(const Font& font) -> type& override;
   auto setGeometry(Geometry geometry) -> type& override;
-  auto setMargin(float margin = 0) -> type&;
-  auto setPadding(Geometry padding = {}) -> type&;
-  auto setSpacing(float spacing = 5) -> type&;
-  auto setVisible(bool visible = true) -> type&;
+  auto setPadding(Geometry padding) -> type&;
+  auto setParent(mObject* parent = nullptr, int offset = -1) -> type&;
+  auto setSpacing(float spacing) -> type&;
+  auto setVisible(bool visible) -> type& override;
+  auto spacing() const -> float;
+  auto synchronize() -> type&;
 
-  struct Settings {
-    float alignment = 0.5;
+private:
+  auto destruct() -> void override;
+
+  struct State {
+    maybe<float> alignment;
+    vector<HorizontalLayoutCell> cells;
     Geometry padding;
     float spacing = 5;
-  } settings;
+  } state;
+};
 
-  struct Property : Size {
-    Property() = default;
-    Property(float width, float height, float spacing) : Size(width, height), _spacing(spacing) {}
-    auto setSpacing(float spacing) -> Property& { return _spacing = spacing, *this; }
-    auto spacing() const -> float { return _spacing; }
-    float _spacing = 0;
-  };
-  vector<Property> properties;
+struct mHorizontalLayoutCell : mObject {
+  using type = mHorizontalLayoutCell;
+
+  auto alignment() const -> maybe<float>;
+  auto setAlignment(maybe<float> alignment) -> type&;
+  auto setEnabled(bool enabled) -> type& override;
+  auto setFont(const Font& font) -> type& override;
+  auto setParent(mObject* parent = nullptr, int offset = -1) -> type& override;
+  auto setSizable(sSizable sizable) -> type&;
+  auto setSize(Size size) -> type&;
+  auto setSpacing(float spacing) -> type&;
+  auto setVisible(bool visible) -> type& override;
+  auto sizable() const -> Sizable;
+  auto size() const -> Size;
+  auto spacing() const -> float;
+  auto synchronize() -> type&;
+
+private:
+  auto destruct() -> void override;
+
+  struct State {
+    maybe<float> alignment;
+    sSizable sizable;
+    Size size;
+    float spacing = 5;
+  } state;
+
+  friend class mHorizontalLayout;
 };
 
 #endif
diff --git a/hiro/extension/list-view-item.cpp b/hiro/extension/list-view-item.cpp
deleted file mode 100644
index 51b09e79..00000000
--- a/hiro/extension/list-view-item.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-#if defined(Hiro_ListView)
-
-mListViewItem::mListViewItem() {
-  append(TableViewCell());
-}
-
-auto mListViewItem::checkable() const -> bool {
-  return cell(0).checkable();
-}
-
-auto mListViewItem::checked() const -> bool {
-  return cell(0).checked();
-}
-
-auto mListViewItem::icon() const -> image {
-  return cell(0).icon();
-}
-
-auto mListViewItem::reset() -> type& {
-  mTableViewItem::reset();
-  append(TableViewCell());
-  return *this;
-}
-
-auto mListViewItem::setCheckable(bool checkable) -> type& {
-  cell(0).setCheckable(checkable);
-  return *this;
-}
-
-auto mListViewItem::setChecked(bool checked) -> type& {
-  cell(0).setChecked(checked);
-  return *this;
-}
-
-auto mListViewItem::setIcon(const image& icon) -> type& {
-  cell(0).setIcon(icon);
-  return *this;
-}
-
-auto mListViewItem::setText(const string& text) -> type& {
-  cell(0).setText(text);
-  return *this;
-}
-
-auto mListViewItem::text() const -> string {
-  return cell(0).text();
-}
-
-#endif
diff --git a/hiro/extension/list-view-item.hpp b/hiro/extension/list-view-item.hpp
deleted file mode 100644
index cc26c933..00000000
--- a/hiro/extension/list-view-item.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-#if defined(Hiro_ListView)
-
-struct ListViewItem;
-struct mListViewItem;
-using sListViewItem = shared_pointer<mListViewItem>;
-
-struct mListViewItem : mTableViewItem {
-  using type = mListViewItem;
-  using mTableViewItem::append;
-  using mTableViewItem::remove;
-
-  mListViewItem();
-  auto checkable() const -> bool;
-  auto checked() const -> bool;
-  auto icon() const -> image;
-  auto reset() -> type&;
-  auto setCheckable(bool checkable) -> type&;
-  auto setChecked(bool checked) -> type&;
-  auto setIcon(const image& icon = {}) -> type&;
-  auto setText(const string& text) -> type&;
-  auto text() const -> string;
-};
-
-#endif
diff --git a/hiro/extension/list-view.cpp b/hiro/extension/list-view.cpp
index 3db2a86c..89e27d4c 100644
--- a/hiro/extension/list-view.cpp
+++ b/hiro/extension/list-view.cpp
@@ -72,4 +72,52 @@ auto mListView::selected() const -> ListViewItem {
   return ListViewItem{mTableView::selected()};
 }
 
+//
+
+mListViewItem::mListViewItem() {
+  append(TableViewCell());
+}
+
+auto mListViewItem::checkable() const -> bool {
+  return cell(0).checkable();
+}
+
+auto mListViewItem::checked() const -> bool {
+  return cell(0).checked();
+}
+
+auto mListViewItem::icon() const -> image {
+  return cell(0).icon();
+}
+
+auto mListViewItem::reset() -> type& {
+  mTableViewItem::reset();
+  append(TableViewCell());
+  return *this;
+}
+
+auto mListViewItem::setCheckable(bool checkable) -> type& {
+  cell(0).setCheckable(checkable);
+  return *this;
+}
+
+auto mListViewItem::setChecked(bool checked) -> type& {
+  cell(0).setChecked(checked);
+  return *this;
+}
+
+auto mListViewItem::setIcon(const image& icon) -> type& {
+  cell(0).setIcon(icon);
+  return *this;
+}
+
+auto mListViewItem::setText(const string& text) -> type& {
+  cell(0).setText(text);
+  return *this;
+}
+
+auto mListViewItem::text() const -> string {
+  return cell(0).text();
+}
+
 #endif
diff --git a/hiro/extension/list-view.hpp b/hiro/extension/list-view.hpp
index 0a18fa4d..ce7a7f41 100644
--- a/hiro/extension/list-view.hpp
+++ b/hiro/extension/list-view.hpp
@@ -1,8 +1,13 @@
 #if defined(Hiro_ListView)
 
 struct ListView;
+struct ListViewItem;
+
 struct mListView;
+struct mListViewItem;
+
 using sListView = shared_pointer<mListView>;
+using sListViewItem = shared_pointer<mListViewItem>;
 
 struct mListView : mTableView {
   using type = mListView;
@@ -30,4 +35,21 @@ struct mListView : mTableView {
   } state;
 };
 
+struct mListViewItem : mTableViewItem {
+  using type = mListViewItem;
+  using mTableViewItem::append;
+  using mTableViewItem::remove;
+
+  mListViewItem();
+  auto checkable() const -> bool;
+  auto checked() const -> bool;
+  auto icon() const -> image;
+  auto reset() -> type&;
+  auto setCheckable(bool checkable) -> type&;
+  auto setChecked(bool checked) -> type&;
+  auto setIcon(const image& icon = {}) -> type&;
+  auto setText(const string& text) -> type&;
+  auto text() const -> string;
+};
+
 #endif
diff --git a/hiro/extension/message-dialog.cpp b/hiro/extension/message-dialog.cpp
index ce7a9835..f692e8a6 100644
--- a/hiro/extension/message-dialog.cpp
+++ b/hiro/extension/message-dialog.cpp
@@ -52,10 +52,10 @@ auto MessageDialog::_run() -> string {
       HorizontalLayout controlLayout{&layout, Size{~0, 0}};
         Widget controlSpacer{&controlLayout, Size{~0, 0}};
 
-  layout.setMargin(5);
+  layout.setPadding(5);
   messageIcon.setIcon(state.icon);
   messageText.setText(state.text);
-  for(auto n : range(state.buttons)) {
+  for(auto n : range(state.buttons.size())) {
     Button button{&controlLayout, Size{80, 0}, 5};
     button.onActivate([&, n] { state.response = state.buttons[n]; window.setModal(false); });
     button.setText(state.buttons[n]);
diff --git a/hiro/extension/shared.hpp b/hiro/extension/shared.hpp
index e3ffaa1a..5ec33961 100644
--- a/hiro/extension/shared.hpp
+++ b/hiro/extension/shared.hpp
@@ -1,41 +1,142 @@
 #if defined(Hiro_FixedLayout)
-using sFixedLayout = shared_pointer<mFixedLayout>;
+struct FixedLayoutCell : sFixedLayoutCell {
+  DeclareSharedObject(FixedLayoutCell)
+
+  auto geometry() const { return self().geometry(); }
+  auto setGeometry(Geometry geometry) { return self().setGeometry(geometry), *this; }
+  auto setSizable(sSizable sizable) { return self().setSizable(sizable), *this; }
+  auto sizable() const { return self().sizable(); }
+};
+
 struct FixedLayout : sFixedLayout {
-  DeclareSharedLayout(FixedLayout)
+  DeclareSharedSizable(FixedLayout)
 
   auto append(sSizable sizable, Geometry geometry) { return self().append(sizable, geometry), *this; }
-  auto modify(sSizable sizable, Geometry geometry) { return self().modify(sizable, geometry), *this; }
+  auto cell(uint position) const { return self().cell(position); }
+  auto cell(sSizable sizable) const { return self().cell(sizable); }
+  auto cellCount() const { return self().cellCount(); }
+  auto remove(sFixedLayoutCell cell) { return self().remove(cell), *this; }
+  auto reset() { return self().reset(), *this; }
 };
 #endif
 
 #if defined(Hiro_HorizontalLayout)
-using sHorizontalLayout = shared_pointer<mHorizontalLayout>;
-struct HorizontalLayout : sHorizontalLayout {
-  DeclareSharedLayout(HorizontalLayout)
+struct HorizontalLayoutCell : sHorizontalLayoutCell {
+  DeclareSharedObject(HorizontalLayoutCell)
 
+  auto alignment() const { return self().alignment(); }
+  auto setAlignment(maybe<float> alignment = {}) { return self().setAlignment(alignment), *this; }
+  auto setSizable(sSizable sizable) { return self().setSizable(sizable), *this; }
+  auto setSize(Size size) { return self().setSize(size), *this; }
+  auto setSpacing(float spacing = 5) { return self().setSpacing(spacing), *this; }
+  auto sizable() const { return self().sizable(); }
+  auto size() const { return self().size(); }
+  auto spacing() const { return self().spacing(); }
+};
+
+struct HorizontalLayout : sHorizontalLayout {
+  DeclareSharedSizable(HorizontalLayout)
+
+  auto alignment() const { return self().alignment(); }
   auto append(sSizable sizable, Size size, float spacing = 5) { return self().append(sizable, size, spacing), *this; }
-  auto modify(sSizable sizable, Size size, float spacing = 5) { return self().modify(sizable, size, spacing), *this; }
-  auto setAlignment(float alignment = 0.5) { return self().setAlignment(alignment), *this; }
-  auto setMargin(float margin = 0) { return self().setMargin(margin), *this; }
+  auto cell(uint position) const { return self().cell(position); }
+  auto cell(sSizable sizable) const { return self().cell(sizable); }
+  auto cellCount() const { return self().cellCount(); }
+  auto remove(sHorizontalLayoutCell cell) { return self().remove(cell), *this; }
+  auto reset() { return self().reset(), *this; }
+  auto setAlignment(maybe<float> alignment = {}) { return self().setAlignment(alignment), *this; }
+  auto setPadding(float padding) { return self().setPadding({padding, padding, padding, padding}), *this; }
   auto setPadding(Geometry padding = {}) { return self().setPadding(padding), *this; }
   auto setSpacing(float spacing = 5) { return self().setSpacing(spacing), *this; }
 };
 #endif
 
 #if defined(Hiro_VerticalLayout)
-using sVerticalLayout = shared_pointer<mVerticalLayout>;
-struct VerticalLayout : sVerticalLayout {
-  DeclareSharedLayout(VerticalLayout)
+struct VerticalLayoutCell : sVerticalLayoutCell {
+  DeclareSharedObject(VerticalLayoutCell)
 
+  auto alignment() const { return self().alignment(); }
+  auto setAlignment(maybe<float> alignment = {}) { return self().setAlignment(alignment), *this; }
+  auto setSizable(sSizable sizable) { return self().setSizable(sizable), *this; }
+  auto setSize(Size size) { return self().setSize(size), *this; }
+  auto setSpacing(float spacing = 5) { return self().setSpacing(spacing), *this; }
+  auto sizable() const { return self().sizable(); }
+  auto size() const { return self().size(); }
+  auto spacing() const { return self().spacing(); }
+};
+
+struct VerticalLayout : sVerticalLayout {
+  DeclareSharedSizable(VerticalLayout)
+
+  auto alignment() const { return self().alignment(); }
   auto append(sSizable sizable, Size size, float spacing = 5) { return self().append(sizable, size, spacing), *this; }
-  auto modify(sSizable sizable, Size size, float spacing = 5) { return self().modify(sizable, size, spacing), *this; }
-  auto setAlignment(float alignment = 0.0) { return self().setAlignment(alignment), *this; }
-  auto setMargin(float margin = 0) { return self().setMargin(margin), *this; }
+  auto cell(uint position) const { return self().cell(position); }
+  auto cell(sSizable sizable) const { return self().cell(sizable); }
+  auto cellCount() const { return self().cellCount(); }
+  auto remove(sSizable sizable) { return self().remove(sizable), *this; }
+  auto remove(sVerticalLayoutCell cell) { return self().remove(cell), *this; }
+  auto reset() { return self().reset(), *this; }
+  auto setAlignment(maybe<float> alignment = {}) { return self().setAlignment(alignment), *this; }
+  auto setPadding(float padding) { return self().setPadding({padding, padding, padding, padding}), *this; }
   auto setPadding(Geometry padding = {}) { return self().setPadding(padding), *this; }
   auto setSpacing(float spacing = 5) { return self().setSpacing(spacing), *this; }
 };
 #endif
 
+#if defined(Hiro_TableLayout)
+struct TableLayoutCell : sTableLayoutCell {
+  DeclareSharedObject(TableLayoutCell)
+
+  auto alignment() const { return self().alignment(); }
+  auto setAlignment(Alignment alignment = {}) { return self().setAlignment(alignment), *this; }
+  auto setSizable(sSizable sizable) { return self().setSizable(sizable), *this; }
+  auto setSize(Size size) { return self().setSize(size), *this; }
+  auto sizable() const { return self().sizable(); }
+  auto size() const { return self().size(); }
+};
+
+struct TableLayoutColumn : sTableLayoutColumn {
+  DeclareSharedObject(TableLayoutColumn)
+
+  auto alignment() const { return self().alignment(); }
+  auto setAlignment(Alignment alignment = {}) { return self().setAlignment(alignment), *this; }
+  auto setSpacing(float spacing = 5) { return self().setSpacing(spacing), *this; }
+  auto spacing() const { return self().spacing(); }
+};
+
+struct TableLayoutRow : sTableLayoutRow {
+  DeclareSharedObject(TableLayoutRow)
+
+  auto alignment() const { return self().alignment(); }
+  auto setAlignment(Alignment alignment = {}) { return self().setAlignment(alignment), *this; }
+  auto setSpacing(float spacing = 5) { return self().setSpacing(spacing), *this; }
+  auto spacing() const { return self().spacing(); }
+};
+
+struct TableLayout : sTableLayout {
+  DeclareSharedSizable(TableLayout)
+
+  auto alignment() const { return self().alignment(); }
+  auto append(sSizable sizable, Size size) { return self().append(sizable, size), *this; }
+  auto cell(uint position) const { return self().cell(position); }
+  auto cell(uint x, uint y) const { return self().cell(x, y); }
+  auto cell(sSizable sizable) const { return self().cell(sizable); }
+  auto cellCount() const { return self().cellCount(); }
+  auto column(uint position) const { return self().column(position); }
+  auto columnCount() const { return self().columnCount(); }
+  auto padding() const { return self().padding(); }
+  auto remove(sTableLayoutCell cell) { return self().remove(cell), *this; }
+  auto reset() { return self().reset(), *this; }
+  auto row(uint position) const { return self().row(position); }
+  auto rowCount() const { return self().rowCount(); }
+  auto setAlignment(Alignment alignment = {}) { return self().setAlignment(alignment), *this; }
+  auto setPadding(float padding) { return self().setPadding({padding, padding, padding, padding}), *this; }
+  auto setPadding(Geometry padding = {}) { return self().setPadding(padding), *this; }
+  auto setSize(Size size) { return self().setSize(size), *this; }
+  auto size() const { return self().size(); }
+};
+#endif
+
 #if defined(Hiro_ListView)
 struct ListViewItem : sListViewItem {
   DeclareSharedObject(ListViewItem)
@@ -56,9 +157,7 @@ struct ListViewItem : sListViewItem {
   auto setText(const string& text = "") { return self().setText(text), *this; }
   auto text() const { return self().text(); }
 };
-#endif
 
-#if defined(Hiro_ListView)
 struct ListView : sListView {
   DeclareSharedWidget(ListView)
 
diff --git a/hiro/extension/table-layout.cpp b/hiro/extension/table-layout.cpp
new file mode 100644
index 00000000..d09ba8c0
--- /dev/null
+++ b/hiro/extension/table-layout.cpp
@@ -0,0 +1,413 @@
+#if defined(Hiro_TableLayout)
+
+auto mTableLayout::alignment() const -> Alignment {
+  return state.alignment;
+}
+
+auto mTableLayout::append(sSizable sizable, Size size) -> type& {
+  TableLayoutCell cell;
+  cell->setSizable(sizable);
+  cell->setSize(size);
+  cell->setParent(this, cellCount());
+  state.cells.append(cell);
+  return *this;
+}
+
+auto mTableLayout::cell(uint position) const -> TableLayoutCell {
+  return state.cells(position, {});
+}
+
+auto mTableLayout::cell(uint x, uint y) const -> TableLayoutCell {
+  if(auto cell = state.cells(y * columnCount() + x, {})) return cell;
+  return {};
+}
+
+auto mTableLayout::cell(sSizable sizable) const -> TableLayoutCell {
+  for(auto& cell : state.cells) {
+    if(cell->state.sizable == sizable) return cell;
+  }
+  return {};
+}
+
+auto mTableLayout::cellCount() const -> uint {
+  return state.cells.size();
+}
+
+auto mTableLayout::column(uint position) const -> TableLayoutColumn {
+  return state.columns(position, {});
+}
+
+auto mTableLayout::columnCount() const -> uint {
+  return state.columns.size();
+}
+
+auto mTableLayout::destruct() -> void {
+  for(auto& cell : state.cells) cell->destruct();
+  for(auto& column : state.columns) column->destruct();
+  for(auto& row : state.rows) row->destruct();
+  mSizable::destruct();
+}
+
+auto mTableLayout::minimumSize() const -> Size {
+  float minimumWidth = 0;
+  for(uint x : range(columnCount())) {
+    float width = 0;
+    auto column = this->column(x);
+    for(uint y : range(rowCount())) {
+      auto row = this->row(y);
+      auto cell = this->cell(x, y);
+      if(cell.size().width() == Size::Minimum || cell.size().width() == Size::Maximum) {
+        width = max(width, cell.sizable()->minimumSize().width());
+      } else {
+        width = max(width, cell.size().width());
+      }
+    }
+    minimumWidth += width;
+    if(x != columnCount() - 1) minimumWidth += column.spacing();
+  }
+
+  float minimumHeight = 0;
+  for(uint y : range(rowCount())) {
+    float height = 0;
+    auto row = this->row(y);
+    for(uint x : range(columnCount())) {
+      auto column = this->column(x);
+      auto cell = this->cell(x, y);
+      if(cell.size().height() == Size::Minimum || cell.size().height() == Size::Maximum) {
+        height = max(height, cell.sizable()->minimumSize().height());
+      } else {
+        height = max(height, cell.size().height());
+      }
+    }
+    minimumHeight += height;
+    if(y != rowCount() - 1) minimumHeight += row.spacing();
+  }
+
+  return {
+    padding().x() + minimumWidth  + padding().width(),
+    padding().y() + minimumHeight + padding().height()
+  };
+}
+
+auto mTableLayout::padding() const -> Geometry {
+  return state.padding;
+}
+
+auto mTableLayout::remove(sTableLayoutCell cell) -> type& {
+  if(cell->parent() != this) return *this;
+  auto offset = cell->offset();
+  cell->setParent();
+  state.cells.remove(offset);
+  for(uint n : range(offset, cellCount())) state.cells[n]->adjustOffset(-1);
+  return synchronize();
+}
+
+auto mTableLayout::reset() -> type& {
+  while(state.cells) remove(state.cells.right());
+  return synchronize();
+}
+
+auto mTableLayout::row(uint position) const -> TableLayoutRow {
+  return state.rows(position, {});
+}
+
+auto mTableLayout::rowCount() const -> uint {
+  return state.rows.size();
+}
+
+auto mTableLayout::setAlignment(Alignment alignment) -> type& {
+  state.alignment = alignment;
+  return synchronize();
+}
+
+auto mTableLayout::setEnabled(bool enabled) -> type& {
+  mSizable::setEnabled(enabled);
+  for(auto& cell : state.cells) cell.setEnabled(cell.enabled());
+  return *this;
+}
+
+auto mTableLayout::setFont(const Font& font) -> type& {
+  mSizable::setFont(font);
+  for(auto& cell : state.cells) cell.setFont(cell.font());
+  return *this;
+}
+
+auto mTableLayout::setGeometry(Geometry geometry) -> type& {
+  mSizable::setGeometry(geometry);
+  auto window = parentWindow(true);
+  if(!window || !window->visible()) return *this;
+
+  geometry.setX(geometry.x() + padding().x());
+  geometry.setY(geometry.y() + padding().y());
+  geometry.setWidth (geometry.width()  - padding().x() - padding().width());
+  geometry.setHeight(geometry.height() - padding().y() - padding().height());
+
+  vector<float> widths;
+  widths.resize(columnCount());
+  uint maximumWidths = 0;
+  for(uint x : range(columnCount())) {
+    float width = 0;
+    auto column = this->column(x);
+    for(uint y : range(rowCount())) {
+      auto row = this->row(y);
+      auto cell = this->cell(x, y);
+      if(cell.size().width() == Size::Maximum) {
+        width = Size::Maximum;
+        maximumWidths++;
+        break;
+      }
+      if(cell.size().width() == Size::Minimum) {
+        width = max(width, cell.sizable()->minimumSize().width());
+      } else {
+        width = max(width, cell.size().width());
+      }
+    }
+    widths[x] = width;
+  }
+
+  vector<float> heights;
+  heights.resize(rowCount());
+  uint maximumHeights = 0;
+  for(uint y : range(rowCount())) {
+    float height = 0;
+    auto row = this->row(y);
+    for(uint x : range(columnCount())) {
+      auto column = this->column(x);
+      auto cell = this->cell(x, y);
+      if(cell.size().height() == Size::Maximum) {
+        height = Size::Maximum;
+        maximumHeights++;
+        break;
+      }
+      if(cell.size().height() == Size::Minimum) {
+        height = max(height, cell.sizable()->minimumSize().height());
+      } else {
+        height = max(height, cell.size().height());
+      }
+    }
+    heights[y] = height;
+  }
+
+  float fixedWidth = 0;
+  for(uint x : range(columnCount())) {
+    if(widths[x] != Size::Maximum) fixedWidth += widths[x];
+    if(x != columnCount() - 1) fixedWidth += column(x)->spacing();
+  }
+  float maximumWidth = (geometry.width() - fixedWidth) / maximumWidths;
+  for(auto& width : widths) {
+    if(width == Size::Maximum) width = maximumWidth;
+  }
+
+  float fixedHeight = 0;
+  for(uint y : range(rowCount())) {
+    if(heights[y] != Size::Maximum) fixedHeight += heights[y];
+    if(y != rowCount() - 1) fixedHeight += row(y)->spacing();
+  }
+  float maximumHeight = (geometry.height() - fixedHeight) / maximumHeights;
+  for(auto& height : heights) {
+    if(height == Size::Maximum) height = maximumHeight;
+  }
+
+  float geometryY = geometry.y();
+  for(uint y : range(rowCount())) {
+    float geometryX = geometry.x();
+    auto row = this->row(y);
+    for(uint x : range(columnCount())) {
+      auto column = this->column(x);
+      auto cell = this->cell(x, y);
+      float geometryWidth  = widths [x];
+      float geometryHeight = heights[y];
+      auto alignment = cell.alignment();
+      if(!alignment) alignment = column.alignment();
+      if(!alignment) alignment = row.alignment();
+      if(!alignment) alignment = this->alignment();
+      if(!alignment) alignment = {0.0, 0.5};
+
+      float cellWidth = cell.size().width();
+      if(cellWidth == Size::Minimum) cellWidth = cell.sizable()->minimumSize().width();
+      if(cellWidth == Size::Maximum) cellWidth = geometryWidth;
+      cellWidth = min(cellWidth, geometryWidth);
+      float cellHeight = cell.size().height();
+      if(cellHeight == Size::Minimum) cellHeight = cell.sizable()->minimumSize().height();
+      if(cellHeight == Size::Maximum) cellHeight = geometryHeight;
+      cellHeight = min(cellHeight, geometryHeight);
+      float cellX = geometryX + alignment.horizontal() * (geometryWidth  - cellWidth);
+      float cellY = geometryY + alignment.vertical()   * (geometryHeight - cellHeight);
+      cell.sizable()->setGeometry({cellX, cellY, cellWidth, cellHeight});
+
+      geometryX += widths[x] + column.spacing();
+    }
+    geometryY += heights[y] + row.spacing();
+  }
+
+  return *this;
+}
+
+auto mTableLayout::setPadding(Geometry padding) -> type& {
+  state.padding = padding;
+  return synchronize();
+}
+
+auto mTableLayout::setParent(mObject* parent, int offset) -> type& {
+  for(auto& cell : reverse(state.cells)) cell->destruct();
+  for(auto& column : reverse(state.columns)) column->destruct();
+  for(auto& row : reverse(state.rows)) row->destruct();
+  mObject::setParent(parent, offset);
+  for(auto& cell : state.cells) cell->setParent(this, cell->offset());
+  for(auto& column : state.columns) column->setParent(this, column->offset());
+  for(auto& row : state.rows) row->setParent(this, row->offset());
+  return *this;
+}
+
+auto mTableLayout::setSize(Size size) -> type& {
+  state.size = size;
+  state.columns.reset();
+  state.rows.reset();
+  for(auto x : range(size.width())) state.columns.append(TableLayoutColumn());
+  for(auto y : range(size.height())) state.rows.append(TableLayoutRow());
+  return synchronize();
+}
+
+auto mTableLayout::setVisible(bool visible) -> type& {
+  mSizable::setVisible(visible);
+  for(auto& cell : state.cells) cell.setVisible(cell.visible());
+  return synchronize();
+}
+
+auto mTableLayout::size() const -> Size {
+  return state.size;
+}
+
+auto mTableLayout::synchronize() -> type& {
+  setGeometry(geometry());
+  return *this;
+}
+
+//
+
+auto mTableLayoutColumn::alignment() const -> Alignment {
+  return state.alignment;
+}
+
+auto mTableLayoutColumn::setAlignment(Alignment alignment) -> type& {
+  state.alignment = alignment;
+  return synchronize();
+}
+
+auto mTableLayoutColumn::setSpacing(float spacing) -> type& {
+  state.spacing = spacing;
+  return synchronize();
+}
+
+auto mTableLayoutColumn::spacing() const -> float {
+  return state.spacing;
+}
+
+auto mTableLayoutColumn::synchronize() -> type& {
+  if(auto parent = this->parent()) {
+    if(auto tableLayout = dynamic_cast<mTableLayout*>(parent)) {
+      tableLayout->synchronize();
+    }
+  }
+  return *this;
+}
+
+//
+
+auto mTableLayoutRow::alignment() const -> Alignment {
+  return state.alignment;
+}
+
+auto mTableLayoutRow::setAlignment(Alignment alignment) -> type& {
+  state.alignment = alignment;
+  return synchronize();
+}
+
+auto mTableLayoutRow::setSpacing(float spacing) -> type& {
+  state.spacing = spacing;
+  return synchronize();
+}
+
+auto mTableLayoutRow::spacing() const -> float {
+  return state.spacing;
+}
+
+auto mTableLayoutRow::synchronize() -> type& {
+  if(auto parent = this->parent()) {
+    if(auto tableLayout = dynamic_cast<mTableLayout*>(parent)) {
+      tableLayout->synchronize();
+    }
+  }
+  return *this;
+}
+
+//
+
+auto mTableLayoutCell::alignment() const -> Alignment {
+  return state.alignment;
+}
+
+auto mTableLayoutCell::destruct() -> void {
+  if(auto& sizable = state.sizable) sizable->destruct();
+  mObject::destruct();
+}
+
+auto mTableLayoutCell::setAlignment(Alignment alignment) -> type& {
+  state.alignment = alignment;
+  return synchronize();
+}
+
+auto mTableLayoutCell::setEnabled(bool enabled) -> type& {
+  mObject::setEnabled(enabled);
+  state.sizable->setEnabled(state.sizable->enabled());
+  return *this;
+}
+
+auto mTableLayoutCell::setFont(const Font& font) -> type& {
+  mObject::setFont(font);
+  state.sizable->setFont(state.sizable->font());
+  return *this;
+}
+
+auto mTableLayoutCell::setParent(mObject* parent, int offset) -> type& {
+  state.sizable->destruct();
+  mObject::setParent(parent, offset);
+  state.sizable->setParent(this, 0);
+  return *this;
+}
+
+auto mTableLayoutCell::setSizable(sSizable sizable) -> type& {
+  state.sizable = sizable;
+  state.sizable->setParent(this, 0);
+  return synchronize();
+}
+
+auto mTableLayoutCell::setSize(Size size) -> type& {
+  state.size = size;
+  return synchronize();
+}
+
+auto mTableLayoutCell::setVisible(bool visible) -> type& {
+  mObject::setVisible(visible);
+  state.sizable->setVisible(state.sizable->visible());
+  return *this;
+}
+
+auto mTableLayoutCell::sizable() const -> Sizable {
+  return state.sizable;
+}
+
+auto mTableLayoutCell::size() const -> Size {
+  return state.size;
+}
+
+auto mTableLayoutCell::synchronize() -> type& {
+  if(auto parent = this->parent()) {
+    if(auto tableLayout = dynamic_cast<mTableLayout*>(parent)) {
+      tableLayout->synchronize();
+    }
+  }
+  return *this;
+}
+
+#endif
diff --git a/hiro/extension/table-layout.hpp b/hiro/extension/table-layout.hpp
new file mode 100644
index 00000000..c270a3b8
--- /dev/null
+++ b/hiro/extension/table-layout.hpp
@@ -0,0 +1,123 @@
+#if defined(Hiro_TableLayout)
+
+struct TableLayout;
+struct TableLayoutColumn;
+struct TableLayoutRow;
+struct TableLayoutCell;
+
+struct mTableLayout;
+struct mTableLayoutColumn;
+struct mTableLayoutRow;
+struct mTableLayoutCell;
+
+using sTableLayout = shared_pointer<mTableLayout>;
+using sTableLayoutColumn = shared_pointer<mTableLayoutColumn>;
+using sTableLayoutRow = shared_pointer<mTableLayoutRow>;
+using sTableLayoutCell = shared_pointer<mTableLayoutCell>;
+
+struct mTableLayout : mSizable {
+  using type = mTableLayout;
+  using mSizable::remove;
+
+  auto alignment() const -> Alignment;
+  auto append(sSizable sizable, Size size) -> type&;
+  auto cell(uint position) const -> TableLayoutCell;
+  auto cell(uint x, uint y) const -> TableLayoutCell;
+  auto cell(sSizable sizable) const -> TableLayoutCell;
+  auto cellCount() const -> uint;
+  auto column(uint position) const -> TableLayoutColumn;
+  auto columnCount() const -> uint;
+  auto minimumSize() const -> Size override;
+  auto padding() const -> Geometry;
+  auto remove(sTableLayoutCell cell) -> type&;
+  auto reset() -> type&;
+  auto row(uint position) const -> TableLayoutRow;
+  auto rowCount() const -> uint;
+  auto setAlignment(Alignment alignment) -> type&;
+  auto setEnabled(bool enabled) -> type& override;
+  auto setFont(const Font& font) -> type& override;
+  auto setGeometry(Geometry geometry) -> type& override;
+  auto setPadding(Geometry padding) -> type&;
+  auto setParent(mObject* parent = nullptr, int offset = -1) -> type& override;
+  auto setSize(Size size) -> type&;
+  auto setVisible(bool visible) -> type& override;
+  auto size() const -> Size;
+  auto synchronize() -> type&;
+
+private:
+  auto destruct() -> void override;
+
+  struct State {
+    Alignment alignment;
+    vector<TableLayoutCell> cells;
+    vector<TableLayoutColumn> columns;
+    Geometry padding;
+    vector<TableLayoutRow> rows;
+    Size size;
+  } state;
+};
+
+struct mTableLayoutColumn : mObject {
+  using type = mTableLayoutColumn;
+
+  auto alignment() const -> Alignment;
+  auto setAlignment(Alignment alignment) -> type&;
+  auto setSpacing(float spacing) -> type&;
+  auto spacing() const -> float;
+  auto synchronize() -> type&;
+
+private:
+  struct State {
+    Alignment alignment;
+    float spacing = 5;
+  } state;
+
+  friend class mTableLayout;
+};
+
+struct mTableLayoutRow : mObject {
+  using type = mTableLayoutRow;
+
+  auto alignment() const -> Alignment;
+  auto setAlignment(Alignment alignment) -> type&;
+  auto setSpacing(float spacing) -> type&;
+  auto spacing() const -> float;
+  auto synchronize() -> type&;
+
+private:
+  struct State {
+    Alignment alignment;
+    float spacing = 5;
+  } state;
+
+  friend class mTableLayout;
+};
+
+struct mTableLayoutCell : mObject {
+  using type = mTableLayoutCell;
+
+  auto alignment() const -> Alignment;
+  auto setAlignment(Alignment alignment) -> type&;
+  auto setEnabled(bool enabled) -> type& override;
+  auto setFont(const Font& font) -> type& override;
+  auto setParent(mObject* parent = nullptr, int offset = -1) -> type& override;
+  auto setSizable(sSizable sizable) -> type&;
+  auto setSize(Size size) -> type&;
+  auto setVisible(bool visible) -> type& override;
+  auto sizable() const -> Sizable;
+  auto size() const -> Size;
+  auto synchronize() -> type&;
+
+private:
+  auto destruct() -> void override;
+
+  struct State {
+    Alignment alignment;
+    sSizable sizable;
+    Size size;
+  } state;
+
+  friend class mTableLayout;
+};
+
+#endif
diff --git a/hiro/extension/vertical-layout.cpp b/hiro/extension/vertical-layout.cpp
index f58382f3..5184d2e3 100644
--- a/hiro/extension/vertical-layout.cpp
+++ b/hiro/extension/vertical-layout.cpp
@@ -1,149 +1,290 @@
 #if defined(Hiro_VerticalLayout)
 
-auto mVerticalLayout::append(sSizable sizable, Size size, float spacing) -> type& {
-  properties.append({size.width(), size.height(), spacing < 0 ? settings.spacing : spacing});
-  mLayout::append(sizable);
-  return *this;
+auto mVerticalLayout::alignment() const -> maybe<float> {
+  return state.alignment;
 }
 
-auto mVerticalLayout::modify(sSizable sizable, Size size, float spacing) -> type& {
-  if(sizable && this->sizable(sizable->offset()) == sizable) {
-    auto& properties = this->properties[sizable->offset()];
-    properties.setWidth(size.width());
-    properties.setHeight(size.height());
-    properties.setSpacing(spacing);
+auto mVerticalLayout::append(sSizable sizable, Size size, float spacing) -> type& {
+  VerticalLayoutCell cell;
+  cell->setSizable(sizable);
+  cell->setSize(size);
+  cell->setSpacing(spacing);
+  cell->setParent(this, cellCount());
+  state.cells.append(cell);
+  return synchronize();
+}
+
+auto mVerticalLayout::cell(uint position) const -> VerticalLayoutCell {
+  return state.cells(position, {});
+}
+
+auto mVerticalLayout::cell(sSizable sizable) const -> VerticalLayoutCell {
+  for(auto& cell : state.cells) {
+    if(cell->state.sizable == sizable) return cell;
   }
-  return *this;
+  return {};
+}
+
+auto mVerticalLayout::cellCount() const -> uint {
+  return state.cells.size();
+}
+
+auto mVerticalLayout::destruct() -> void {
+  for(auto& cell : state.cells) cell->destruct();
+  mSizable::destruct();
 }
 
 auto mVerticalLayout::minimumSize() const -> Size {
-  float width = 0, height = 0;
-
-  for(auto n : range(sizableCount())) {
-    auto& child = properties[sizable(n)->offset()];
-    if(child.width() == Size::Minimum || child.width() == Size::Maximum) {
-      width = max(width, sizable(n)->minimumSize().width());
+  float width = 0;
+  for(auto index : range(cellCount())) {
+    auto cell = this->cell(index);
+    if(cell.size().width() == Size::Minimum || cell.size().width() == Size::Maximum) {
+      width = max(width, cell.sizable().minimumSize().width());
       continue;
     }
-    width = max(width, child.width());
+    width = max(width, cell.size().width());
   }
 
-  for(auto n : range(sizableCount())) {
-    auto& child = properties[sizable(n)->offset()];
-    if(child.height() == Size::Minimum || child.height() == Size::Maximum) {
-      height += sizable(n)->minimumSize().height();
+  float height = 0;
+  for(auto index : range(cellCount())) {
+    auto cell = this->cell(index);
+    if(cell.size().height() == Size::Minimum || cell.size().height() == Size::Maximum) {
+      height += cell.sizable().minimumSize().height();
     } else {
-      height += child.height();
+      height += cell.size().height();
     }
-    if(&child != &properties.right()) height += child.spacing();
+    if(index != cellCount() - 1) height += cell.spacing();
   }
 
   return {
-    settings.padding.x() + width  + settings.padding.width(),
-    settings.padding.y() + height + settings.padding.height()
+    padding().x() + width  + padding().width(),
+    padding().y() + height + padding().height()
   };
 }
 
+auto mVerticalLayout::padding() const -> Geometry {
+  return state.padding;
+}
+
 auto mVerticalLayout::remove(sSizable sizable) -> type& {
-  properties.remove(sizable->offset());
-  mLayout::remove(sizable);
+  for(auto& cell : state.cells) {
+    if(cell->state.sizable == sizable) {
+      remove(cell);
+      break;
+    }
+  }
   return *this;
 }
 
+auto mVerticalLayout::remove(sVerticalLayoutCell cell) -> type& {
+  if(cell->parent() != this) return *this;
+  auto offset = cell->offset();
+  cell->setParent();
+  state.cells.remove(offset);
+  for(uint n : range(offset, cellCount())) state.cells[n]->adjustOffset(-1);
+  return synchronize();
+}
+
 auto mVerticalLayout::reset() -> type& {
-  mLayout::reset();
-  properties.reset();
-  return *this;
+  while(state.cells) remove(state.cells.right());
+  return synchronize();
 }
 
-auto mVerticalLayout::setAlignment(float alignment) -> type& {
-  settings.alignment = max(0.0, min(1.0, alignment));
-  return *this;
+auto mVerticalLayout::setAlignment(maybe<float> alignment) -> type& {
+  state.alignment = alignment;
+  return synchronize();
 }
 
 auto mVerticalLayout::setEnabled(bool enabled) -> type& {
-  mLayout::setEnabled(enabled);
-  for(auto n : range(sizableCount())) {
-    sizable(n)->setEnabled(sizable(n)->enabled());
-  }
+  mSizable::setEnabled(enabled);
+  for(auto& cell : state.cells) cell.sizable().setEnabled(cell.sizable().enabled());
   return *this;
 }
 
 auto mVerticalLayout::setFont(const Font& font) -> type& {
-  mLayout::setFont(font);
-  for(auto n : range(sizableCount())) {
-    sizable(n)->setFont(sizable(n)->font());
-  }
+  mSizable::setFont(font);
+  for(auto& cell : state.cells) cell.sizable().setFont(cell.sizable().font());
   return *this;
 }
 
-auto mVerticalLayout::setGeometry(Geometry containerGeometry) -> type& {
-  mLayout::setGeometry(containerGeometry);
+auto mVerticalLayout::setGeometry(Geometry geometry) -> type& {
+  mSizable::setGeometry(geometry);
+  auto window = parentWindow(true);
+  if(!window || !window->visible()) return *this;
 
-  auto properties = this->properties;
-  for(auto n : range(sizableCount())) {
-    auto& child = properties[sizable(n)->offset()];
-    if(child.width()  == Size::Minimum) child.setWidth(sizable(n)->minimumSize().width());
-    if(child.height() == Size::Minimum) child.setHeight(sizable(n)->minimumSize().height());
+  geometry.setX(geometry.x() + padding().x());
+  geometry.setY(geometry.y() + padding().y());
+  geometry.setWidth (geometry.width()  - padding().x() - padding().width());
+  geometry.setHeight(geometry.height() - padding().y() - padding().height());
+
+  float width = 0;
+  for(auto index : range(cellCount())) {
+    auto cell = this->cell(index);
+    if(cell.size().width() == Size::Maximum) {
+      width = geometry.width();
+      break;
+    } else if(cell.size().width() == Size::Minimum) {
+      width = max(width, cell.sizable().minimumSize().width());
+    } else {
+      width = max(width, cell.size().width());
+    }
   }
 
-  Geometry geometry = containerGeometry;
-  geometry.setX     (geometry.x()      + settings.padding.x());
-  geometry.setY     (geometry.y()      + settings.padding.y());
-  geometry.setWidth (geometry.width()  - settings.padding.x() - settings.padding.width());
-  geometry.setHeight(geometry.height() - settings.padding.y() - settings.padding.height());
-
-  float minimumHeight = 0, maximumHeightCounter = 0;
-  for(auto& child : properties) {
-    if(child.height() == Size::Maximum) maximumHeightCounter++;
-    if(child.height() != Size::Maximum) minimumHeight += child.height();
-    if(&child != &properties.right()) minimumHeight += child.spacing();
+  vector<float> heights;
+  heights.resize(cellCount());
+  uint maximumHeights = 0;
+  for(auto index : range(cellCount())) {
+    auto cell = this->cell(index);
+    float height = 0;
+    if(cell.size().height() == Size::Maximum) {
+      height = Size::Maximum;
+      maximumHeights++;
+    } else if(cell.size().height() == Size::Minimum) {
+      height = cell.sizable().minimumSize().height();
+    } else {
+      height = cell.size().height();
+    }
+    heights[index] = height;
   }
 
-  for(auto& child : properties) {
-    if(child.width()  == Size::Maximum) child.setWidth(geometry.width());
-    if(child.height() == Size::Maximum) child.setHeight((geometry.height() - minimumHeight) / maximumHeightCounter);
+  float fixedHeight = 0;
+  for(uint index : range(state.cells.size())) {
+    if(heights[index] != Size::Maximum) fixedHeight += heights[index];
+    if(index != cellCount() - 1) fixedHeight += cell(index).spacing();
   }
 
-  float maximumWidth = 0;
-  for(auto& child : properties) maximumWidth = max(maximumWidth, child.width());
-
-  for(auto n : range(sizableCount())) {
-    auto& child = properties[sizable(n)->offset()];
-    float pivot = (maximumWidth - child.width()) * settings.alignment;
-    Geometry childGeometry = {geometry.x() + pivot, geometry.y(), child.width(), child.height()};
-    if(childGeometry.width()  < 1) childGeometry.setWidth (1);
-    if(childGeometry.height() < 1) childGeometry.setHeight(1);
-    sizable(n)->setGeometry(childGeometry);
-
-    geometry.setY     (geometry.y()      + child.height() + child.spacing());
-    geometry.setHeight(geometry.height() - child.height() + child.spacing());
+  float maximumHeight = (geometry.height() - fixedHeight) / maximumHeights;
+  for(auto& height : heights) {
+    if(height == Size::Maximum) height = maximumHeight;
   }
 
-  return *this;
-}
+  float geometryX = geometry.x();
+  float geometryY = geometry.y();
+  for(auto index : range(cellCount())) {
+    float geometryWidth  = width;
+    float geometryHeight = heights[index];
+    auto cell = this->cell(index);
+    auto alignment = cell.alignment();
+    if(!alignment) alignment = this->alignment();
+    if(!alignment) alignment = 0.5;
+    float cellWidth  = cell.size().width();
+    float cellHeight = geometryHeight;
+    if(cellWidth == Size::Minimum) cellWidth = cell.sizable()->minimumSize().width();
+    if(cellWidth == Size::Maximum) cellWidth = geometryWidth;
+    float cellX = geometryX + alignment() * (geometryWidth - cellWidth);
+    float cellY = geometryY;
+    cell.sizable().setGeometry({cellX, cellY, cellWidth, cellHeight});
+    geometryY += geometryHeight + cell.spacing();
+  }
 
-auto mVerticalLayout::setMargin(float margin) -> type& {
-  setPadding({margin, margin, margin, margin});
   return *this;
 }
 
 auto mVerticalLayout::setPadding(Geometry padding) -> type& {
-  settings.padding = padding;
-  setGeometry(geometry());
+  state.padding = padding;
+  return synchronize();
+}
+
+auto mVerticalLayout::setParent(mObject* parent, int offset) -> type& {
+  for(auto& cell : reverse(state.cells)) cell->destruct();
+  mSizable::setParent(parent, offset);
+  for(auto& cell : state.cells) cell->setParent(this, cell->offset());
   return *this;
 }
 
 auto mVerticalLayout::setSpacing(float spacing) -> type& {
-  settings.spacing = spacing;
+  state.spacing = spacing;
+  return synchronize();
+}
+
+auto mVerticalLayout::setVisible(bool visible) -> type& {
+  mSizable::setVisible(visible);
+  for(auto& cell : state.cells) cell.sizable().setVisible(cell.sizable().visible());
+  return synchronize();
+}
+
+auto mVerticalLayout::spacing() const -> float {
+  return state.spacing;
+}
+
+auto mVerticalLayout::synchronize() -> type& {
   setGeometry(geometry());
   return *this;
 }
 
-auto mVerticalLayout::setVisible(bool visible) -> type& {
-  mLayout::setVisible(visible);
-  for(auto n : range(sizableCount())) {
-    sizable(n)->setVisible(sizable(n)->visible());
+//
+
+auto mVerticalLayoutCell::alignment() const -> maybe<float> {
+  return state.alignment;
+}
+
+auto mVerticalLayoutCell::destruct() -> void {
+  if(auto& sizable = state.sizable) sizable->destruct();
+  mObject::destruct();
+}
+
+auto mVerticalLayoutCell::setAlignment(maybe<float> alignment) -> type& {
+  state.alignment = alignment;
+  return synchronize();
+}
+
+auto mVerticalLayoutCell::setEnabled(bool enabled) -> type& {
+  mObject::setEnabled(enabled);
+  state.sizable->setEnabled(state.sizable->enabled());
+  return *this;
+}
+
+auto mVerticalLayoutCell::setFont(const Font& font) -> type& {
+  mObject::setFont(font);
+  state.sizable->setFont(state.sizable->font());
+  return *this;
+}
+
+auto mVerticalLayoutCell::setParent(mObject* parent, int offset) -> type& {
+  state.sizable->destruct();
+  mObject::setParent(parent, offset);
+  state.sizable->setParent(this, 0);
+  return *this;
+}
+
+auto mVerticalLayoutCell::setSizable(sSizable sizable) -> type& {
+  state.sizable = sizable;
+  return synchronize();
+}
+
+auto mVerticalLayoutCell::setSize(Size size) -> type& {
+  state.size = size;
+  return synchronize();
+}
+
+auto mVerticalLayoutCell::setSpacing(float spacing) -> type& {
+  state.spacing = spacing;
+  return synchronize();
+}
+
+auto mVerticalLayoutCell::setVisible(bool visible) -> type& {
+  mObject::setVisible(visible);
+  state.sizable->setVisible(state.sizable->visible());
+  return *this;
+}
+
+auto mVerticalLayoutCell::sizable() const -> Sizable {
+  return state.sizable;
+}
+
+auto mVerticalLayoutCell::size() const -> Size {
+  return state.size;
+}
+
+auto mVerticalLayoutCell::spacing() const -> float {
+  return state.spacing;
+}
+
+auto mVerticalLayoutCell::synchronize() -> type& {
+  if(auto parent = this->parent()) {
+    if(auto verticalLayout = dynamic_cast<mVerticalLayout*>(parent)) {
+      verticalLayout->synchronize();
+    }
   }
   return *this;
 }
diff --git a/hiro/extension/vertical-layout.hpp b/hiro/extension/vertical-layout.hpp
index aeb2fc0b..895e8ff4 100644
--- a/hiro/extension/vertical-layout.hpp
+++ b/hiro/extension/vertical-layout.hpp
@@ -1,38 +1,78 @@
 #if defined(Hiro_VerticalLayout)
 
-struct mVerticalLayout : mLayout {
+struct VerticalLayout;
+struct VerticalLayoutCell;
+
+struct mVerticalLayout;
+struct mVerticalLayoutCell;
+
+using sVerticalLayout = shared_pointer<mVerticalLayout>;
+using sVerticalLayoutCell = shared_pointer<mVerticalLayoutCell>;
+
+struct mVerticalLayout : mSizable {
   using type = mVerticalLayout;
-  using mLayout::append;
-  using mLayout::remove;
+  using mSizable::remove;
 
+  auto alignment() const -> maybe<float>;
   auto append(sSizable sizable, Size size, float spacing = 5) -> type&;
-  auto modify(sSizable sizable, Size size, float spacing = 5) -> type&;
+  auto cell(uint position) const -> VerticalLayoutCell;
+  auto cell(sSizable sizable) const -> VerticalLayoutCell;
+  auto cellCount() const -> uint;
   auto minimumSize() const -> Size override;
-  auto remove(sSizable sizable) -> type& override;
+  auto padding() const -> Geometry;
+  auto remove(sSizable sizable) -> type&;
+  auto remove(sVerticalLayoutCell cell) -> type&;
   auto reset() -> type& override;
-  auto setAlignment(float alignment = 0.0) -> type&;
-  auto setEnabled(bool enabled = true) -> type& override;
-  auto setFont(const Font& font = {}) -> type& override;
+  auto setAlignment(maybe<float> alignment) -> type&;
+  auto setEnabled(bool enabled) -> type& override;
+  auto setFont(const Font& font) -> type& override;
   auto setGeometry(Geometry geometry) -> type& override;
-  auto setMargin(float margin = 0) -> type&;
-  auto setPadding(Geometry padding = {}) -> type&;
-  auto setSpacing(float spacing = 5) -> type&;
-  auto setVisible(bool visible = true) -> type& override;
+  auto setPadding(Geometry padding) -> type&;
+  auto setParent(mObject* parent = nullptr, int offset = -1) -> type& override;
+  auto setSpacing(float spacing) -> type&;
+  auto setVisible(bool visible) -> type& override;
+  auto spacing() const -> float;
+  auto synchronize() -> type&;
 
-  struct Settings {
-    float alignment = 0.0;
+private:
+  auto destruct() -> void override;
+
+  struct State {
+    maybe<float> alignment;
+    vector<VerticalLayoutCell> cells;
     Geometry padding;
     float spacing = 5;
-  } settings;
+  } state;
+};
 
-  struct Property : Size {
-    Property() = default;
-    Property(float width, float height, float spacing) : Size(width, height), _spacing(spacing) {}
-    auto setSpacing(float spacing) -> Property& { return _spacing = spacing, *this; }
-    auto spacing() const -> float { return _spacing; }
-    float _spacing = 0;
-  };
-  vector<Property> properties;
+struct mVerticalLayoutCell : mObject {
+  using type = mVerticalLayoutCell;
+
+  auto alignment() const -> maybe<float>;
+  auto setAlignment(maybe<float> alignment) -> type&;
+  auto setEnabled(bool enabled) -> type& override;
+  auto setFont(const Font& font) -> type& override;
+  auto setParent(mObject* parent = nullptr, int offset = -1) -> type& override;
+  auto setSizable(sSizable sizable) -> type&;
+  auto setSize(Size size) -> type&;
+  auto setSpacing(float spacing) -> type&;
+  auto setVisible(bool visible) -> type& override;
+  auto sizable() const -> Sizable;
+  auto size() const -> Size;
+  auto spacing() const -> float;
+  auto synchronize() -> type&;
+
+private:
+  auto destruct() -> void override;
+
+  struct State {
+    maybe<float> alignment;
+    sSizable sizable;
+    Size size;
+    float spacing = 5;
+  } state;
+
+  friend class mVerticalLayout;
 };
 
 #endif
diff --git a/hiro/gtk/application.cpp b/hiro/gtk/application.cpp
index 93bd48df..717d6665 100644
--- a/hiro/gtk/application.cpp
+++ b/hiro/gtk/application.cpp
@@ -2,18 +2,16 @@
 
 namespace hiro {
 
+vector<pWindow*> pApplication::windows;
+
 #if defined(DISPLAY_XORG)
 XlibDisplay* pApplication::display = nullptr;
 #endif
 
 auto pApplication::run() -> void {
-  if(Application::state.onMain) {
-    while(!Application::state.quit) {
-      Application::doMain();
-      processEvents();
-    }
-  } else {
-    gtk_main();
+  while(!Application::state.quit) {
+    Application::doMain();
+    processEvents();
   }
 }
 
@@ -23,6 +21,7 @@ auto pApplication::pendingEvents() -> bool {
 
 auto pApplication::processEvents() -> void {
   while(pendingEvents()) gtk_main_iteration_do(false);
+  for(auto& window : windows) window->_synchronizeGeometry();
 }
 
 auto pApplication::quit() -> void {
@@ -30,7 +29,7 @@ auto pApplication::quit() -> void {
   if(gtk_main_level()) gtk_main_quit();
 
   #if defined(DISPLAY_XORG)
-  //todo: Keyboard::poll() is being called after Application::quit();
+  //TODO: Keyboard::poll() is being called after Application::quit();
   //so if display is closed; this causes a segfault
   //XCloseDisplay(display);
   //display = nullptr;
@@ -46,15 +45,17 @@ auto pApplication::initialize() -> void {
   auto name = Application::state.name ? Application::state.name : string{"hiro"};
   gdk_set_program_class(name);
 
-  #if 1
+  #if defined(BUILD_DEBUG)
+  //force a trap on Gtk-CRITICAL and Gtk-WARNING messages
+  //this allows gdb to perform a backtrace to find an error's origin point
+  int argc = 3;
+  char* argv[] = {name.get(), new char[7], new char[19], nullptr};
+  strcpy(argv[1], "--sync");
+  strcpy(argv[2], "--g-fatal-warnings");
+  g_log_set_always_fatal(GLogLevelFlags(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING));
+  #else
   int argc = 1;
   char* argv[] = {name.get(), nullptr};
-  #else
-  //--g-fatal-warnings will force a trap on Gtk-CRITICAL and Gtk-WARNING messages
-  //this allows gdb to perform a backtrace to find an error's origin point
-  int argc = 2;
-  char* argv[] = {name.get(), new char[19], nullptr};
-  strcpy(argv[1], "--g-fatal-warnings");
   #endif
   char** argvp = argv;
 
diff --git a/hiro/gtk/application.hpp b/hiro/gtk/application.hpp
index 9f8feb73..9440bd1e 100644
--- a/hiro/gtk/application.hpp
+++ b/hiro/gtk/application.hpp
@@ -3,16 +3,18 @@
 namespace hiro {
 
 struct pApplication {
-  #if defined(DISPLAY_XORG)
-  static XlibDisplay* display;
-  #endif
-
   static auto run() -> void;
   static auto pendingEvents() -> bool;
   static auto processEvents() -> void;
   static auto quit() -> void;
 
   static auto initialize() -> void;
+
+  static vector<pWindow*> windows;
+
+  #if defined(DISPLAY_XORG)
+  static XlibDisplay* display;
+  #endif
 };
 
 }
diff --git a/hiro/gtk/header.hpp b/hiro/gtk/header.hpp
index 7b1002b5..26ad5d00 100644
--- a/hiro/gtk/header.hpp
+++ b/hiro/gtk/header.hpp
@@ -21,9 +21,13 @@
   #include <gdk/gdkkeysyms.h>
   #include <gtk/gtk.h>
   #if defined(Hiro_SourceEdit)
-    #include <gtksourceview/gtksourceview.h>
-    #include <gtksourceview/gtksourcelanguagemanager.h>
-    #include <gtksourceview/gtksourcestyleschememanager.h>
+    #if HIRO_GTK==2
+      #include <gtksourceview/gtksourceview.h>
+      #include <gtksourceview/gtksourcelanguagemanager.h>
+      #include <gtksourceview/gtksourcestyleschememanager.h>
+    #elif HIRO_GTK==3
+      #include <gtksourceview/gtksource.h>
+    #endif
   #endif
   #include <nall/windows/guard.hpp>
   #include <nall/windows/registry.hpp>
diff --git a/hiro/gtk/layout.cpp b/hiro/gtk/layout.cpp
deleted file mode 100644
index dd581312..00000000
--- a/hiro/gtk/layout.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-#if defined(Hiro_Layout)
-
-namespace hiro {
-
-auto pLayout::construct() -> void {
-  for(auto& sizable : state().sizables) sizable->construct();
-}
-
-auto pLayout::destruct() -> void {
-  for(auto& sizable : state().sizables) sizable->destruct();
-}
-
-auto pLayout::setEnabled(bool enabled) -> void {
-  for(auto& sizable : state().sizables) {
-    if(auto self = sizable->self()) self->setEnabled(sizable->enabled(true));
-  }
-}
-
-auto pLayout::setFont(const Font& font) -> void {
-  for(auto& sizable : state().sizables) {
-    if(auto self = sizable->self()) self->setFont(sizable->font(true));
-  }
-}
-
-auto pLayout::setVisible(bool visible) -> void {
-  for(auto& sizable : state().sizables) {
-    if(auto self = sizable->self()) self->setVisible(sizable->visible(true));
-  }
-}
-
-}
-
-#endif
diff --git a/hiro/gtk/layout.hpp b/hiro/gtk/layout.hpp
deleted file mode 100644
index dba11836..00000000
--- a/hiro/gtk/layout.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#if defined(Hiro_Layout)
-
-namespace hiro {
-
-struct pLayout : pSizable {
-  Declare(Layout, Sizable)
-
-  auto setEnabled(bool enabled) -> void override;
-  auto setFont(const Font& font) -> void override;
-  auto setVisible(bool visible) -> void override;
-};
-
-}
-
-#endif
diff --git a/hiro/gtk/menu-bar.cpp b/hiro/gtk/menu-bar.cpp
index d1522dd3..0b8c8e8d 100644
--- a/hiro/gtk/menu-bar.cpp
+++ b/hiro/gtk/menu-bar.cpp
@@ -13,7 +13,7 @@ auto pMenuBar::append(sMenu menu) -> void {
     parent->_append(*menu);
     if(menu->self()) {
       menu->self()->setFont(menu->font(true));
-      menu->self()->setVisible(menu->visible(true));
+      menu->self()->setVisible(menu->visible());
     }
   }
 }
diff --git a/hiro/gtk/object.cpp b/hiro/gtk/object.cpp
index 3c6ac442..3e93e050 100644
--- a/hiro/gtk/object.cpp
+++ b/hiro/gtk/object.cpp
@@ -27,6 +27,9 @@ auto pObject::setFocused() -> void {
 auto pObject::setFont(const Font& font) -> void {
 }
 
+auto pObject::setParent(mObject* parent, int offset) -> void {
+}
+
 auto pObject::setVisible(bool visible) -> void {
 }
 
diff --git a/hiro/gtk/object.hpp b/hiro/gtk/object.hpp
index 096743f9..ae3f1af3 100644
--- a/hiro/gtk/object.hpp
+++ b/hiro/gtk/object.hpp
@@ -2,7 +2,7 @@
 
 namespace hiro {
 
-struct pObject {
+struct pObject : mLock {
   pObject(mObject& reference) : reference(reference) {}
   virtual ~pObject() {}
   auto self() const -> mObject& { return (mObject&)reference; }
@@ -16,22 +16,10 @@ struct pObject {
   virtual auto setEnabled(bool enabled) -> void;
   virtual auto setFocused() -> void;
   virtual auto setFont(const Font& font) -> void;
+  virtual auto setParent(mObject* parent, int offset) -> void;
   virtual auto setVisible(bool visible) -> void;
 
-  auto locked() const -> bool { return locks || Application::state.quit; }
-  auto lock() -> void { ++locks; }
-  auto unlock() -> void { --locks; }
-
-  struct Lock {
-    Lock(pObject& self) : self(self) { self.locks++; }
-    ~Lock() { self.locks--; }
-
-    pObject& self;
-  };
-  auto acquire() -> Lock { return {*this}; }
-
   mObject& reference;
-  signed locks = 0;
 };
 
 }
diff --git a/hiro/gtk/platform.cpp b/hiro/gtk/platform.cpp
index 0092d3e9..328cdf64 100644
--- a/hiro/gtk/platform.cpp
+++ b/hiro/gtk/platform.cpp
@@ -26,7 +26,6 @@
 #include "action/menu-radio-item.cpp"
 
 #include "sizable.cpp"
-#include "layout.cpp"
 
 #include "widget/widget.cpp"
 #include "widget/button.cpp"
diff --git a/hiro/gtk/platform.hpp b/hiro/gtk/platform.hpp
index 839a2c79..893f0333 100644
--- a/hiro/gtk/platform.hpp
+++ b/hiro/gtk/platform.hpp
@@ -37,7 +37,6 @@ namespace hiro {
 #include "action/menu-radio-item.hpp"
 
 #include "sizable.hpp"
-#include "layout.hpp"
 
 #include "widget/widget.hpp"
 #include "widget/button.hpp"
diff --git a/hiro/gtk/settings.hpp b/hiro/gtk/settings.hpp
index 4223095c..24fc0126 100644
--- a/hiro/gtk/settings.hpp
+++ b/hiro/gtk/settings.hpp
@@ -11,8 +11,8 @@ struct Settings {
     int frameY = 24;
     int frameWidth = 8;
     int frameHeight = 28;
-    int menuHeight = 20;
-    int statusHeight = 20;
+    int menuHeight = 8;
+    int statusHeight = 4;
   } geometry;
 };
 
diff --git a/hiro/gtk/widget/frame.cpp b/hiro/gtk/widget/frame.cpp
index e07f2a67..ac161b23 100644
--- a/hiro/gtk/widget/frame.cpp
+++ b/hiro/gtk/widget/frame.cpp
@@ -17,37 +17,36 @@ auto pFrame::destruct() -> void {
   gtk_widget_destroy(gtkWidget);
 }
 
-auto pFrame::append(shared_pointer<mLayout> layout) -> void {
-  if(auto layout = _layout()) layout->setFont(layout->self().font(true));
+auto pFrame::append(sSizable sizable) -> void {
+  if(auto sizable = _sizable()) sizable->setFont(sizable->self().font(true));
 }
 
 auto pFrame::container(mWidget& widget) -> GtkWidget* {
   return gtk_widget_get_parent(gtkWidget);
 }
 
-auto pFrame::remove(shared_pointer<mLayout> layout) -> void {
+auto pFrame::remove(sSizable sizable) -> void {
 }
 
 auto pFrame::setEnabled(bool enabled) -> void {
-  if(auto layout = _layout()) layout->setEnabled(layout->self().enabled(true));
+  if(auto sizable = _sizable()) sizable->setEnabled(sizable->self().enabled(true));
   pWidget::setEnabled(enabled);
 }
 
 auto pFrame::setFont(const Font& font) -> void {
-  if(auto layout = _layout()) layout->setFont(layout->self().font(true));
+  if(auto sizable = _sizable()) sizable->setFont(sizable->self().font(true));
   pFont::setFont(gtkLabel, font);
 }
 
 auto pFrame::setGeometry(Geometry geometry) -> void {
-  pWidget::setGeometry(geometry);
-  if(auto layout = state().layout) {
+  if(auto& sizable = state().sizable) {
     Size size = pFont::size(self().font(true), state().text);
     if(!state().text) size.setHeight(10);
     geometry.setX(geometry.x() + 2);
     geometry.setY(geometry.y() + (size.height() - 1));
     geometry.setWidth(geometry.width() - 5);
     geometry.setHeight(geometry.height() - (size.height() + 2));
-    layout->setGeometry(geometry);
+    sizable->setGeometry(geometry);
   }
 }
 
@@ -56,13 +55,15 @@ auto pFrame::setText(const string& text) -> void {
 }
 
 auto pFrame::setVisible(bool visible) -> void {
-  if(auto layout = _layout()) layout->setVisible(layout->self().visible(true));
+  if(auto sizable = _sizable()) sizable->setVisible(sizable->self().visible(true));
   pWidget::setVisible(visible);
 }
 
-auto pFrame::_layout() -> pLayout* {
-  if(auto layout = state().layout) return layout->self();
-  return nullptr;
+auto pFrame::_sizable() -> maybe<pSizable&> {
+  if(auto& sizable = state().sizable) {
+    if(auto self = sizable->self()) return *self;
+  }
+  return {};
 }
 
 }
diff --git a/hiro/gtk/widget/frame.hpp b/hiro/gtk/widget/frame.hpp
index 71f49004..28db8d64 100644
--- a/hiro/gtk/widget/frame.hpp
+++ b/hiro/gtk/widget/frame.hpp
@@ -5,16 +5,16 @@ namespace hiro {
 struct pFrame : pWidget {
   Declare(Frame, Widget)
 
-  auto append(shared_pointer<mLayout> layout) -> void;
+  auto append(sSizable sizable) -> void;
   auto container(mWidget& widget) -> GtkWidget* override;
-  auto remove(shared_pointer<mLayout> layout) -> void;
+  auto remove(sSizable sizable) -> void;
   auto setEnabled(bool enabled) -> void override;
   auto setFont(const Font& font) -> void override;
   auto setGeometry(Geometry geometry) -> void override;
   auto setText(const string& text) -> void;
   auto setVisible(bool visible) -> void override;
 
-  auto _layout() -> pLayout*;
+  auto _sizable() -> maybe<pSizable&>;
 
   GtkWidget* gtkLabel = nullptr;
 };
diff --git a/hiro/gtk/widget/horizontal-slider.cpp b/hiro/gtk/widget/horizontal-slider.cpp
index 74964835..6472a67f 100644
--- a/hiro/gtk/widget/horizontal-slider.cpp
+++ b/hiro/gtk/widget/horizontal-slider.cpp
@@ -30,7 +30,7 @@ auto pHorizontalSlider::destruct() -> void {
 }
 
 auto pHorizontalSlider::minimumSize() const -> Size {
-  return {0, 20};
+  return {3, 20};
 }
 
 auto pHorizontalSlider::setLength(unsigned length) -> void {
diff --git a/hiro/gtk/widget/horizontal-slider.hpp b/hiro/gtk/widget/horizontal-slider.hpp
index a05ba416..5ebda5b5 100644
--- a/hiro/gtk/widget/horizontal-slider.hpp
+++ b/hiro/gtk/widget/horizontal-slider.hpp
@@ -5,7 +5,7 @@ namespace hiro {
 struct pHorizontalSlider : pWidget {
   Declare(HorizontalSlider, Widget)
 
-  auto minimumSize() const -> Size;
+  auto minimumSize() const -> Size override;
   auto setLength(unsigned length) -> void;
   auto setPosition(unsigned position) -> void;
 };
diff --git a/hiro/gtk/widget/icon-view.cpp b/hiro/gtk/widget/icon-view.cpp
index 2bcae943..ec84cbd1 100644
--- a/hiro/gtk/widget/icon-view.cpp
+++ b/hiro/gtk/widget/icon-view.cpp
@@ -43,7 +43,7 @@ auto pIconView::construct() -> void {
   setFlow(state().flow);
   setForegroundColor(state().foregroundColor);
   setOrientation(state().orientation);
-  for(auto position : range(self().items())) {
+  for(auto position : range(self().itemCount())) {
     auto& item = state().items[position];
     append(item);
   }
diff --git a/hiro/gtk/widget/tab-frame-item.cpp b/hiro/gtk/widget/tab-frame-item.cpp
index 3b8f548b..348d3b4b 100644
--- a/hiro/gtk/widget/tab-frame-item.cpp
+++ b/hiro/gtk/widget/tab-frame-item.cpp
@@ -3,17 +3,17 @@
 namespace hiro {
 
 auto pTabFrameItem::construct() -> void {
-  if(auto layout = state().layout) layout->construct();
+  if(auto& sizable = state().sizable) sizable->construct();
 }
 
 auto pTabFrameItem::destruct() -> void {
-  if(auto layout = state().layout) layout->destruct();
+  if(auto& sizable = state().sizable) sizable->destruct();
 }
 
-auto pTabFrameItem::append(sLayout layout) -> void {
+auto pTabFrameItem::append(sSizable sizable) -> void {
 }
 
-auto pTabFrameItem::remove(sLayout layout) -> void {
+auto pTabFrameItem::remove(sSizable sizable) -> void {
 }
 
 auto pTabFrameItem::setClosable(bool closable) -> void {
@@ -46,9 +46,11 @@ auto pTabFrameItem::setText(const string& text) -> void {
   }
 }
 
-auto pTabFrameItem::_parent() -> pTabFrame* {
-  if(auto parent = self().parentTabFrame()) return parent->self();
-  return nullptr;
+auto pTabFrameItem::_parent() -> maybe<pTabFrame&> {
+  if(auto parent = self().parentTabFrame()) {
+    if(auto self = parent->self()) return *self;
+  }
+  return {};
 }
 
 }
diff --git a/hiro/gtk/widget/tab-frame-item.hpp b/hiro/gtk/widget/tab-frame-item.hpp
index 495555b0..400db35f 100644
--- a/hiro/gtk/widget/tab-frame-item.hpp
+++ b/hiro/gtk/widget/tab-frame-item.hpp
@@ -5,15 +5,15 @@ namespace hiro {
 struct pTabFrameItem : pObject {
   Declare(TabFrameItem, Object)
 
-  auto append(sLayout layout) -> void;
-  auto remove(sLayout layout) -> void;
+  auto append(sSizable sizable) -> void;
+  auto remove(sSizable sizable) -> void;
   auto setClosable(bool closable) -> void;
   auto setIcon(const image& icon) -> void;
   auto setMovable(bool movable) -> void;
   auto setSelected() -> void;
   auto setText(const string& text) -> void;
 
-  auto _parent() -> pTabFrame*;
+  auto _parent() -> maybe<pTabFrame&>;
 };
 
 }
diff --git a/hiro/gtk/widget/tab-frame.cpp b/hiro/gtk/widget/tab-frame.cpp
index 7eebad78..a2051f24 100644
--- a/hiro/gtk/widget/tab-frame.cpp
+++ b/hiro/gtk/widget/tab-frame.cpp
@@ -12,7 +12,7 @@ static auto TabFrame_change(GtkNotebook* notebook, GtkWidget* page, unsigned pos
 
 static auto TabFrame_close(GtkButton* button, pTabFrame* p) -> void {
   maybe<unsigned> position;
-  for(auto n : range(p->tabs)) {
+  for(auto n : range(p->tabs.size())) {
     if(button == (GtkButton*)p->tabs[n].close) {
       position = n;
       break;
@@ -29,7 +29,7 @@ static auto TabFrame_move(GtkNotebook* notebook, GtkWidget* page, unsigned moveT
   if(auto item = p->self().item(position)) item->state.selected = true;
 
   maybe<unsigned> moveFrom;
-  for(auto n : range(p->tabs)) {
+  for(auto n : range(p->tabs.size())) {
     if(page == p->tabs[n].child) {
       moveFrom = n;
       break;
@@ -109,13 +109,13 @@ auto pTabFrame::container(mWidget& widget) -> GtkWidget* {
   mObject* object = &widget;
   while(object) {
     if(object->parentTabFrameItem()) break;
-    if(auto layout = object->parentLayout()) { object = layout; continue; }
+    if(auto parent = object->parent()) { object = parent; continue; }
     break;
   }
 
-  unsigned position = 0;
+  uint position = 0;
   for(auto& item : state().items) {
-    if(item->state.layout.data() == object) return tabs[position].child;
+    if(item->state.sizable.data() == object) return tabs[position].child;
     position++;
   }
 
@@ -144,20 +144,13 @@ auto pTabFrame::remove(sTabFrameItem item) -> void {
   unlock();
 }
 
-auto pTabFrame::setEnabled(bool enabled) -> void {
-  for(auto& item : state().items) {
-    if(auto layout = item->state.layout) {
-      if(layout->self()) layout->self()->setEnabled(layout->enabled(true));
-    }
-  }
-  pWidget::setEnabled(enabled);
-}
-
 auto pTabFrame::setFont(const Font& font) -> void {
   for(auto n : range(tabs.size())) {
     pFont::setFont(tabs[n].title, font);
-    if(auto layout = state().items[n]->state.layout) {
-      if(layout->self()) layout->self()->setFont(layout->font(true));
+    if(auto sizable = state().items[n]->state.sizable) {
+      if(auto self = sizable->self()) {
+        self->setFont(sizable->font(true));
+      }
     }
   }
 }
@@ -174,7 +167,7 @@ auto pTabFrame::setGeometry(Geometry geometry) -> void {
     geometry.setHeight(geometry.height() - 6);
   }
   for(auto& item : state().items) {
-    if(item->state.layout) item->state.layout->setGeometry(geometry);
+    if(item->state.sizable) item->state.sizable->setGeometry(geometry);
   }
 }
 
@@ -186,10 +179,6 @@ auto pTabFrame::setItemIcon(unsigned position, const image& icon) -> void {
   _synchronizeTab(position);
 }
 
-auto pTabFrame::setItemLayout(unsigned position, shared_pointer<mLayout> layout) -> void {
-//if(layout->self()) layout->self()->setParent();
-}
-
 auto pTabFrame::setItemMovable(unsigned position, bool movable) -> void {
   lock();
   gtk_notebook_set_tab_reorderable(GTK_NOTEBOOK(gtkWidget), tabs[position].child, movable);
@@ -202,6 +191,10 @@ auto pTabFrame::setItemSelected(unsigned position) -> void {
   unlock();
 }
 
+auto pTabFrame::setItemSizable(unsigned position, sSizable sizable) -> void {
+//if(layout->self()) layout->self()->setParent();
+}
+
 auto pTabFrame::setItemText(unsigned position, const string& text) -> void {
   _synchronizeTab(position);
 }
@@ -218,22 +211,11 @@ auto pTabFrame::setNavigation(Navigation navigation) -> void {
   setGeometry(self().geometry());
 }
 
-auto pTabFrame::setVisible(bool visible) -> void {
-  for(auto& item : state().items) {
-    if(auto layout = item->state.layout) {
-      if(layout->self()) {
-        layout->self()->setVisible(layout->visible(true));
-      }
-    }
-  }
-  pWidget::setVisible(visible);
-}
-
 auto pTabFrame::_synchronizeLayout() -> void {
   for(auto& item : state().items) {
-    if(auto layout = item->state.layout) {
-      if(auto self = layout->self()) {
-        self->setVisible(layout->visible(true) && item->selected());
+    if(auto& sizable = item->state.sizable) {
+      if(auto self = sizable->self()) {
+        self->setVisible(sizable->visible() && item->selected());
       }
     }
   }
@@ -262,7 +244,7 @@ auto pTabFrame::_synchronizeTab(unsigned position) -> void {
 auto pTabFrame::_tabHeight() -> unsigned {
   signed height = 1;
 
-  for(auto n : range(self().items())) {
+  for(auto n : range(self().itemCount())) {
     GtkAllocation imageAllocation, titleAllocation, closeAllocation;
     gtk_widget_get_allocation(tabs[n].image, &imageAllocation);
     gtk_widget_get_allocation(tabs[n].title, &titleAllocation);
@@ -279,7 +261,7 @@ auto pTabFrame::_tabHeight() -> unsigned {
 auto pTabFrame::_tabWidth() -> unsigned {
   signed width = 1;
 
-  for(auto n : range(self().items())) {
+  for(auto n : range(self().itemCount())) {
     GtkAllocation imageAllocation, titleAllocation, closeAllocation;
     gtk_widget_get_allocation(tabs[n].image, &imageAllocation);
     gtk_widget_get_allocation(tabs[n].title, &titleAllocation);
diff --git a/hiro/gtk/widget/tab-frame.hpp b/hiro/gtk/widget/tab-frame.hpp
index a0cf067c..deba721d 100644
--- a/hiro/gtk/widget/tab-frame.hpp
+++ b/hiro/gtk/widget/tab-frame.hpp
@@ -8,20 +8,16 @@ struct pTabFrame : pWidget {
   auto append(sTabFrameItem item) -> void;
   auto container(mWidget& widget) -> GtkWidget* override;
   auto remove(sTabFrameItem item) -> void;
-  auto setEnabled(bool enabled) -> void override;
   auto setFont(const Font& font) -> void override;
   auto setGeometry(Geometry geometry) -> void override;
   auto setItemClosable(unsigned position, bool closable) -> void;
   auto setItemIcon(unsigned position, const image& icon) -> void;
-  auto setItemLayout(unsigned position, sLayout layout) -> void;
   auto setItemMovable(unsigned position, bool movable) -> void;
   auto setItemSelected(unsigned position) -> void;
+  auto setItemSizable(unsigned position, sSizable sizable) -> void;
   auto setItemText(unsigned position, const string& text) -> void;
   auto setNavigation(Navigation navigation) -> void;
-  auto setVisible(bool visible) -> void override;
 
-  auto _append(shared_pointer<mTabFrameItem> item) -> void;
-  auto _remove(shared_pointer<mTabFrameItem> item) -> void;
   auto _synchronizeLayout() -> void;
   auto _synchronizeTab(unsigned position) -> void;
   auto _tabHeight() -> unsigned;
diff --git a/hiro/gtk/widget/table-view-cell.cpp b/hiro/gtk/widget/table-view-cell.cpp
index 33167750..ad41e842 100644
--- a/hiro/gtk/widget/table-view-cell.cpp
+++ b/hiro/gtk/widget/table-view-cell.cpp
@@ -48,11 +48,14 @@ auto pTableViewCell::_parent() -> maybe<pTableViewItem&> {
 auto pTableViewCell::_setState() -> void {
   if(auto parent = _parent()) {
     if(auto grandparent = _grandparent()) {
-      grandparent->lock();
-      gtk_list_store_set(grandparent->gtkListStore, &parent->gtkIter, 3 * self().offset() + 0, state().checked, -1);
-      gtk_list_store_set(grandparent->gtkListStore, &parent->gtkIter, 3 * self().offset() + 1, CreatePixbuf(state().icon), -1);
-      gtk_list_store_set(grandparent->gtkListStore, &parent->gtkIter, 3 * self().offset() + 2, state().text.data(), -1);
-      grandparent->unlock();
+      if(auto& tableViewHeader = grandparent->state().header) {
+        if(self().offset() < tableViewHeader->columnCount()) {
+          auto lock = grandparent->acquire();
+          gtk_list_store_set(grandparent->gtkListStore, &parent->gtkIter, 3 * self().offset() + 0, state().checked, -1);
+          gtk_list_store_set(grandparent->gtkListStore, &parent->gtkIter, 3 * self().offset() + 1, CreatePixbuf(state().icon), -1);
+          gtk_list_store_set(grandparent->gtkListStore, &parent->gtkIter, 3 * self().offset() + 2, state().text.data(), -1);
+        }
+      }
     }
   }
 }
diff --git a/hiro/gtk/widget/table-view-column.cpp b/hiro/gtk/widget/table-view-column.cpp
index a3dd9057..05598aed 100644
--- a/hiro/gtk/widget/table-view-column.cpp
+++ b/hiro/gtk/widget/table-view-column.cpp
@@ -5,7 +5,7 @@ namespace hiro {
 auto pTableViewColumn::construct() -> void {
   if(auto grandparent = _grandparent()) {
     auto handle = grandparent.data();
-    unsigned offset = self().offset();
+    uint offset = self().offset();
 
     #if HIRO_GTK==2
     gtkHeader = gtk_hbox_new(false, 0);
diff --git a/hiro/gtk/widget/table-view-item.cpp b/hiro/gtk/widget/table-view-item.cpp
index 56b628cc..8abbb6e3 100644
--- a/hiro/gtk/widget/table-view-item.cpp
+++ b/hiro/gtk/widget/table-view-item.cpp
@@ -4,19 +4,17 @@ namespace hiro {
 
 auto pTableViewItem::construct() -> void {
   if(auto parent = _parent()) {
-    parent->lock();
+    auto lock = parent->acquire();
     gtk_list_store_append(parent->gtkListStore, &gtkIter);
     _setState();
-    parent->unlock();
   }
 }
 
 auto pTableViewItem::destruct() -> void {
   if(auto parent = _parent()) {
-    parent->lock();
+    auto lock = parent->acquire();
     gtk_list_store_remove(parent->gtkListStore, &gtkIter);
     parent->_updateSelected();
-    parent->unlock();
   }
 }
 
@@ -34,6 +32,7 @@ auto pTableViewItem::setBackgroundColor(Color color) -> void {
 
 auto pTableViewItem::setFocused() -> void {
   if(auto parent = _parent()) {
+    auto lock = parent->acquire();
     GtkTreePath* path = gtk_tree_path_new_from_string(string{self().offset()});
     gtk_tree_view_set_cursor(parent->gtkTreeView, path, nullptr, false);
     gtk_tree_view_scroll_to_cell(parent->gtkTreeView, path, nullptr, true, 0.5, 0.0);
@@ -57,7 +56,7 @@ auto pTableViewItem::_parent() -> maybe<pTableView&> {
 
 auto pTableViewItem::_setState() -> void {
   if(auto parent = _parent()) {
-    parent->lock();
+    auto lock = parent->acquire();
     if(state().selected) {
       gtk_tree_selection_select_iter(parent->gtkTreeSelection, &gtkIter);
     } else {
@@ -67,7 +66,6 @@ auto pTableViewItem::_setState() -> void {
     for(auto& cell : state().cells) {
       if(auto self = cell->self()) self->_setState();
     }
-    parent->unlock();
   }
 }
 
diff --git a/hiro/gtk/widget/table-view.cpp b/hiro/gtk/widget/table-view.cpp
index dd033dc4..24be583b 100644
--- a/hiro/gtk/widget/table-view.cpp
+++ b/hiro/gtk/widget/table-view.cpp
@@ -184,6 +184,8 @@ auto pTableView::_columnWidth(unsigned _column) -> unsigned {
 }
 
 auto pTableView::_createModel() -> void {
+  auto lock = acquire();
+
   gtk_tree_view_set_model(gtkTreeView, nullptr);
   gtkListStore = nullptr;
   gtkTreeModel = nullptr;
@@ -204,6 +206,11 @@ auto pTableView::_createModel() -> void {
   gtkListStore = gtk_list_store_newv(types.size(), types.data());
   gtkTreeModel = GTK_TREE_MODEL(gtkListStore);
   gtk_tree_view_set_model(gtkTreeView, gtkTreeModel);
+
+//  for(auto& item : state().items) {
+//    gtk_list_store_append(gtkListStore, &item->self()->gtkIter);
+//    item->self()->_setState();
+//  }
 }
 
 auto pTableView::_doActivate() -> void {
@@ -385,7 +392,7 @@ auto pTableView::_updateSelected() -> void {
 
   bool identical = selected.size() == currentSelection.size();
   if(identical) {
-    for(auto n : range(selected)) {
+    for(auto n : range(selected.size())) {
       if(selected[n] != currentSelection[n]) {
         identical = false;
         break;
@@ -410,7 +417,7 @@ auto pTableView::_width(unsigned column) -> unsigned {
     unsigned width = 1;
     if(!header->column(column).visible()) return width;
     if(header->visible()) width = max(width, _columnWidth(column));
-    for(auto row : range(state().items)) {
+    for(auto row : range(self().itemCount())) {
       width = max(width, _cellWidth(row, column));
     }
     return width;
diff --git a/hiro/gtk/widget/vertical-slider.cpp b/hiro/gtk/widget/vertical-slider.cpp
index 984992e4..0bacf22d 100644
--- a/hiro/gtk/widget/vertical-slider.cpp
+++ b/hiro/gtk/widget/vertical-slider.cpp
@@ -30,7 +30,7 @@ auto pVerticalSlider::destruct() -> void {
 }
 
 auto pVerticalSlider::minimumSize() const -> Size {
-  return {20, 0};
+  return {20, 3};
 }
 
 auto pVerticalSlider::setLength(unsigned length) -> void {
diff --git a/hiro/gtk/widget/vertical-slider.hpp b/hiro/gtk/widget/vertical-slider.hpp
index d970aaa7..98798f99 100644
--- a/hiro/gtk/widget/vertical-slider.hpp
+++ b/hiro/gtk/widget/vertical-slider.hpp
@@ -5,7 +5,7 @@ namespace hiro {
 struct pVerticalSlider : pWidget {
   Declare(VerticalSlider, Widget)
 
-  auto minimumSize() const -> Size;
+  auto minimumSize() const -> Size override;
   auto setLength(unsigned length) -> void;
   auto setPosition(unsigned position) -> void;
 };
diff --git a/hiro/gtk/widget/widget.cpp b/hiro/gtk/widget/widget.cpp
index 27c55044..808edf23 100644
--- a/hiro/gtk/widget/widget.cpp
+++ b/hiro/gtk/widget/widget.cpp
@@ -44,18 +44,16 @@ auto pWidget::setGeometry(Geometry geometry) -> void {
   if(geometry.width()  < 1) geometry.setWidth (1);
   if(geometry.height() < 1) geometry.setHeight(1);
   gtk_widget_set_size_request(gtkWidget, geometry.width(), geometry.height());
-  if(gtk_widget_get_realized(gtkWidget)) {
+  if(0 && gtk_widget_get_realized(gtkWidget)) {
     static bool locked = false;
     if(!locked) {
       locked = true;
       auto time = chrono::millisecond();
       while(chrono::millisecond() - time < 20) {
-        gtk_main_iteration_do(false);
         GtkAllocation allocation;
         gtk_widget_get_allocation(gtkWidget, &allocation);
-        if(allocation.width  != geometry.width ()) continue;
-        if(allocation.height != geometry.height()) continue;
-        break;
+        if(allocation.width == geometry.width() && allocation.height == geometry.height()) break;
+        gtk_main_iteration_do(false);
       }
       locked = false;
     }
diff --git a/hiro/gtk/window.cpp b/hiro/gtk/window.cpp
index e48a4f5a..52787dcc 100644
--- a/hiro/gtk/window.cpp
+++ b/hiro/gtk/window.cpp
@@ -8,7 +8,7 @@ static auto Window_close(GtkWidget* widget, GdkEvent* event, pWindow* p) -> sign
   } else {
     p->self().setVisible(false);
   }
-  if(p->state().modal && !p->pObject::state().visible) p->self().setModal(false);
+  if(p->self().modal() && !p->self().visible()) p->self().setModal(false);
   return true;
 }
 
@@ -30,62 +30,28 @@ static auto Window_draw(GtkWidget* widget, cairo_t* context, pWindow* p) -> sign
 
     cairo_set_operator(context, CAIRO_OPERATOR_SOURCE);
     cairo_paint(context);
+  } else {
+    #if HIRO_GTK==3
+    auto style = gtk_widget_get_style_context(widget);
+    GtkAllocation allocation;
+    gtk_widget_get_allocation(widget, &allocation);
+    gtk_render_background(style, context, 0, 0, allocation.width, allocation.height);
+    #endif
   }
+
   return false;
 }
 
 //GTK2 expose-event
 static auto Window_expose(GtkWidget* widget, GdkEvent* event, pWindow* p) -> signed {
-  if(auto color = p->state().backgroundColor) {
-    cairo_t* context = gdk_cairo_create(gtk_widget_get_window(widget));
-    Window_draw(widget, context, p);
-    cairo_destroy(context);
-  }
+  cairo_t* context = gdk_cairo_create(gtk_widget_get_window(widget));
+  Window_draw(widget, context, p);
+  cairo_destroy(context);
   return false;
 }
 
 static auto Window_configure(GtkWidget* widget, GdkEvent* event, pWindow* p) -> signed {
-  if(!gtk_widget_get_realized(p->widget)) return false;
-  if(!p->pObject::state().visible) return false;
-  GdkWindow* gdkWindow = gtk_widget_get_window(widget);
-
-  GdkRectangle border, client;
-  gdk_window_get_frame_extents(gdkWindow, &border);
-  #if HIRO_GTK==2
-  gdk_window_get_geometry(gdkWindow, nullptr, nullptr, &client.width, &client.height, nullptr);
-  #elif HIRO_GTK==3
-  gdk_window_get_geometry(gdkWindow, nullptr, nullptr, &client.width, &client.height);
-  #endif
-  gdk_window_get_origin(gdkWindow, &client.x, &client.y);
-
-  if(!p->state().fullScreen) {
-    //update geometry settings
-    settings.geometry.frameX = client.x - border.x;
-    settings.geometry.frameY = client.y - border.y;
-    settings.geometry.frameWidth = border.width - client.width;
-    settings.geometry.frameHeight = border.height - client.height;
-  }
-
-  Geometry geometry = {
-    client.x,
-    client.y + p->_menuHeight(),
-    client.width,
-    client.height - p->_menuHeight() - p->_statusHeight()
-  };
-
-  //move
-  if(geometry.x() != p->state().geometry.x() || geometry.y() != p->state().geometry.y()) {
-    if(!p->state().fullScreen) {
-      p->state().geometry.setPosition({geometry.x(), geometry.y()});
-    }
-    if(!p->locked()) p->self().doMove();
-  }
-
-  //size
-  if(geometry.width() != p->state().geometry.width() || geometry.height() != p->state().geometry.height()) {
-    p->onSizePending = true;
-  }
-
+  p->_synchronizeMargin();
   return false;
 }
 
@@ -98,11 +64,17 @@ GtkSelectionData* data, unsigned type, unsigned timestamp, pWindow* p) -> void {
 }
 
 static auto Window_getPreferredWidth(GtkWidget* widget, int* minimalWidth, int* naturalWidth) -> void {
-  //TODO: get pWindow; use sizeRequest
+  if(auto p = (pWindow*)g_object_get_data(G_OBJECT(widget), "hiro::window")) {
+    *minimalWidth = 1;
+    *naturalWidth = 1;  //p->state().geometry.width();
+  }
 }
 
 static auto Window_getPreferredHeight(GtkWidget* widget, int* minimalHeight, int* naturalHeight) -> void {
-  //TODO: get pWindow; use sizeRequest
+  if(auto p = (pWindow*)g_object_get_data(G_OBJECT(widget), "hiro::window")) {
+    *minimalHeight = 1;
+    *naturalHeight = p->state().geometry.height();
+  }
 }
 
 static auto Window_keyPress(GtkWidget* widget, GdkEventKey* event, pWindow* p) -> signed {
@@ -128,28 +100,10 @@ static auto Window_keyRelease(GtkWidget* widget, GdkEventKey* event, pWindow* p)
 }
 
 static auto Window_sizeAllocate(GtkWidget* widget, GtkAllocation* allocation, pWindow* p) -> void {
-  //size-allocate is sent before window-state-event when maximizing a window
-  //this means Window::onSize() handler would have the old maximized state if we used the latter signal
   p->_synchronizeState();
-
-  //size-allocate sent from gtk_fixed_move(); detect if layout unchanged and return
-  if(allocation->width == p->lastAllocation.width
-  && allocation->height == p->lastAllocation.height) return;
-
-  if(!p->state().fullScreen) {
-    p->state().geometry.setSize({allocation->width, allocation->height});
-  }
-
-  if(auto& layout = p->state().layout) {
-    layout->setGeometry(p->self().geometry().setPosition(0, 0));
-  }
-
-  if(!p->locked() && p->onSizePending) {
-    p->onSizePending = false;
-    p->self().doSize();
-  }
-
-  p->lastAllocation = *allocation;
+  p->_synchronizeGeometry();
+  p->_synchronizeMargin();
+  return;
 }
 
 static auto Window_sizeRequest(GtkWidget* widget, GtkRequisition* requisition, pWindow* p) -> void {
@@ -172,10 +126,6 @@ static auto Window_stateEvent(GtkWidget* widget, GdkEvent* event, pWindow* p) ->
 }
 
 auto pWindow::construct() -> void {
-  lastAllocation.width  = 0;
-  lastAllocation.height = 0;
-  onSizePending = false;
-
   widget = gtk_window_new(GTK_WINDOW_TOPLEVEL);
   gtk_window_set_resizable(GTK_WINDOW(widget), true);
 
@@ -245,13 +195,22 @@ auto pWindow::construct() -> void {
   widgetClass->get_preferred_height = Window_getPreferredHeight;
   #endif
   g_signal_connect(G_OBJECT(widget), "window-state-event", G_CALLBACK(Window_stateEvent), (gpointer)this);
+
+  g_object_set_data(G_OBJECT(widget), "hiro::window", (gpointer)this);
+  g_object_set_data(G_OBJECT(formContainer), "hiro::window", (gpointer)this);
+
+  pApplication::windows.append(this);
 }
 
 auto pWindow::destruct() -> void {
-  gtk_widget_destroy(widget);
-}
+  for(uint offset : range(pApplication::windows.size())) {
+    if(pApplication::windows[offset] == this) {
+      pApplication::windows.remove(offset);
+      break;
+    }
+  }
 
-auto pWindow::append(sLayout layout) -> void {
+  gtk_widget_destroy(widget);
 }
 
 auto pWindow::append(sMenuBar menuBar) -> void {
@@ -260,6 +219,9 @@ auto pWindow::append(sMenuBar menuBar) -> void {
   _setMenuVisible(menuBar->visible(true));
 }
 
+auto pWindow::append(sSizable sizable) -> void {
+}
+
 auto pWindow::append(sStatusBar statusBar) -> void {
   _setStatusEnabled(statusBar->enabled(true));
   _setStatusFont(statusBar->font(true));
@@ -285,13 +247,13 @@ auto pWindow::frameMargin() const -> Geometry {
   };
 }
 
-auto pWindow::remove(sLayout layout) -> void {
-}
-
 auto pWindow::remove(sMenuBar menuBar) -> void {
   _setMenuVisible(false);
 }
 
+auto pWindow::remove(sSizable sizable) -> void {
+}
+
 auto pWindow::remove(sStatusBar statusBar) -> void {
   _setStatusVisible(false);
 }
@@ -317,10 +279,6 @@ auto pWindow::setEnabled(bool enabled) -> void {
   if(auto& statusBar = state().statusBar) {
     if(auto self = statusBar->self()) self->setEnabled(statusBar->enabled(true));
   }
-
-  if(auto& layout = state().layout) {
-    if(auto self = layout->self()) self->setEnabled(layout->enabled(true));
-  }
 }
 
 auto pWindow::setFocused() -> void {
@@ -329,31 +287,28 @@ auto pWindow::setFocused() -> void {
 
 auto pWindow::setFullScreen(bool fullScreen) -> void {
   if(fullScreen) {
-    windowedGeometry = state().geometry;
     gtk_window_fullscreen(GTK_WINDOW(widget));
-    state().geometry = Monitor::geometry(Monitor::primary());
   } else {
     gtk_window_unfullscreen(GTK_WINDOW(widget));
-    state().geometry = windowedGeometry;
   }
   auto time = chrono::millisecond();
-  while(chrono::millisecond() - time < 20) gtk_main_iteration_do(false);
+  while(chrono::millisecond() - time < 20) Application::processEvents();
 }
 
 auto pWindow::setGeometry(Geometry geometry) -> void {
-  Geometry margin = frameMargin();
+  auto margin = frameMargin();
   gtk_window_move(GTK_WINDOW(widget), geometry.x() - margin.x(), geometry.y() - margin.y());
 
   setMaximumSize(state().maximumSize);
   setMinimumSize(state().minimumSize);
 
-  gtk_widget_set_size_request(formContainer, geometry.width(), geometry.height());
   auto time1 = chrono::millisecond();
-  while(chrono::millisecond() - time1 < 20) gtk_main_iteration_do(false);
+  while(chrono::millisecond() - time1 < 20) Application::processEvents();
 
   gtk_window_resize(GTK_WINDOW(widget), geometry.width(), geometry.height() + _menuHeight() + _statusHeight());
+
   auto time2 = chrono::millisecond();
-  while(chrono::millisecond() - time2 < 20) gtk_main_iteration_do(false);
+  while(chrono::millisecond() - time2 < 20) Application::processEvents();
 }
 
 auto pWindow::setMaximized(bool maximized) -> void {
@@ -366,9 +321,9 @@ auto pWindow::setMaximized(bool maximized) -> void {
 }
 
 auto pWindow::setMaximumSize(Size size) -> void {
-  if(size.height()) size.setHeight(size.height() + _menuHeight() + _statusHeight());
-
+  //TODO: this doesn't have any effect in GTK2 or GTK3
   GdkGeometry geometry;
+  if(size.height()) size.setHeight(size.height() + _menuHeight() + _statusHeight());
   geometry.max_width  = !state().resizable ? state().geometry.width()  : size.width()  ? size.width()  : 32767;
   geometry.max_height = !state().resizable ? state().geometry.height() : size.height() ? size.height() : 32767;
   gtk_window_set_geometry_hints(GTK_WINDOW(widget), nullptr, &geometry, GDK_HINT_MAX_SIZE);
@@ -384,12 +339,13 @@ auto pWindow::setMinimized(bool minimized) -> void {
 }
 
 auto pWindow::setMinimumSize(Size size) -> void {
-  if(size.height()) size.setHeight(size.height() + _menuHeight() + _statusHeight());
+  gtk_widget_set_size_request(formContainer, size.width(), size.height());  //for GTK3
 
   GdkGeometry geometry;
+  if(size.height()) size.setHeight(size.height() + _menuHeight() + _statusHeight());
   geometry.min_width  = !state().resizable ? state().geometry.width()  : size.width()  ? size.width()  : 1;
   geometry.min_height = !state().resizable ? state().geometry.height() : size.height() ? size.height() : 1;
-  gtk_window_set_geometry_hints(GTK_WINDOW(widget), nullptr, &geometry, GDK_HINT_MIN_SIZE);
+  gtk_window_set_geometry_hints(GTK_WINDOW(widget), nullptr, &geometry, GDK_HINT_MIN_SIZE);  //for GTK2
 }
 
 auto pWindow::setModal(bool modal) -> void {
@@ -424,57 +380,47 @@ auto pWindow::setTitle(const string& title) -> void {
 
 auto pWindow::setVisible(bool visible) -> void {
   gtk_widget_set_visible(widget, visible);
-
-  if(auto& menuBar = state().menuBar) {
-    if(menuBar->self()) menuBar->self()->setVisible(menuBar->visible(true));
-  }
-
-  if(auto& layout = state().layout) {
-    if(layout->self()) layout->self()->setVisible(layout->visible(true));
-  }
-
-  if(auto& statusBar = state().statusBar) {
-    if(statusBar->self()) statusBar->self()->setVisible(statusBar->visible(true));
-  }
-
-  //GTK+ returns invalid widget sizes below without this call
-  Application::processEvents();
-
-  if(visible) {
-    if(gtk_widget_get_visible(gtkMenu)) {
-      GtkAllocation allocation;
-      gtk_widget_get_allocation(gtkMenu, &allocation);
-      settings.geometry.menuHeight = allocation.height;
-    }
-
-    if(gtk_widget_get_visible(gtkStatus)) {
-      GtkAllocation allocation;
-      gtk_widget_get_allocation(gtkStatus, &allocation);
-      settings.geometry.statusHeight = allocation.height;
-    }
-  }
-
-  if(auto& layout = state().layout) {
-    layout->setGeometry(self().geometry().setPosition(0, 0));
-  }
+  _synchronizeMargin();
 }
 
 auto pWindow::_append(mWidget& widget) -> void {
-  if(!widget.self()) return;
-  if(auto parent = widget.parentWidget(true)) {
-    if(auto instance = parent->self()) widget.self()->gtkParent = instance->container(widget);
-  } else {
-    widget.self()->gtkParent = formContainer;
+  if(auto pWidget = widget.self()) {
+    if(auto parent = widget.parentWidget(true)) {
+      if(auto instance = parent->self()) {
+        pWidget->gtkParent = instance->container(widget);
+      }
+    } else {
+      pWidget->gtkParent = formContainer;
+    }
+    if(pWidget->gtkParent) {
+      gtk_fixed_put(GTK_FIXED(pWidget->gtkParent), pWidget->gtkWidget, 0, 0);
+    }
   }
-  gtk_fixed_put(GTK_FIXED(widget.self()->gtkParent), widget.self()->gtkWidget, 0, 0);
 }
 
 auto pWindow::_append(mMenu& menu) -> void {
-  if(menu.self()) gtk_menu_shell_append(GTK_MENU_SHELL(gtkMenu), menu.self()->widget);
+  if(auto pMenu = menu.self()) {
+    gtk_menu_shell_append(GTK_MENU_SHELL(gtkMenu), pMenu->widget);
+  }
 }
 
-auto pWindow::_menuHeight() const -> signed {
-  return gtk_widget_get_visible(gtkMenu) ? settings.geometry.menuHeight : 0;
+auto pWindow::_menuHeight() const -> int {
+  if(auto& menuBar = state().menuBar) {
+    if(menuBar->visible()) {
+      return settings.geometry.menuHeight + _menuTextHeight();
+    }
+  }
+  return 0;
+}
+
+auto pWindow::_menuTextHeight() const -> int {
+  int height = 0;
+  if(auto& menuBar = state().menuBar) {
+    for(auto& menu : menuBar->state.menus) {
+      height = max(height, menu->font(true).size(menu->text()).height());
+    }
+  }
+  return height;
 }
 
 auto pWindow::_setIcon(const string& pathname) -> bool {
@@ -530,14 +476,116 @@ auto pWindow::_setStatusVisible(bool visible) -> void {
   setResizable(self().resizable());
 }
 
-auto pWindow::_statusHeight() const -> signed {
-  return gtk_widget_get_visible(gtkStatus) ? settings.geometry.statusHeight : 0;
+auto pWindow::_statusHeight() const -> int {
+  if(auto& statusBar = state().statusBar) {
+    if(statusBar->visible()) {
+      return settings.geometry.statusHeight + _statusTextHeight();
+    }
+  }
+  return 0;
+}
+
+auto pWindow::_statusTextHeight() const -> int {
+  int height = 0;
+  if(auto& statusBar = state().statusBar) {
+    height = statusBar->font(true).size(statusBar->text()).height();
+  }
+  return height;
+}
+
+//GTK is absolutely hopeless with window sizing
+//it will send size-allocate events during resizing of widgets during size-allocate events
+//instead of fighting with configure-event and size-allocate, just poll the state instead
+auto pWindow::_synchronizeGeometry() -> void {
+  if(locked()) return;
+  auto lock = acquire();
+
+  if(!gtk_widget_get_realized(widget)) return;
+  if(!gtk_widget_get_visible(widget)) return;
+
+  GtkAllocation allocation;
+
+  gtk_widget_get_allocation(formContainer, &allocation);
+  if(allocation.width != lastSize.width || allocation.height != lastSize.height) {
+    auto size = self().geometry().size();
+    state().geometry.setSize({allocation.width, allocation.height});
+    if(auto& sizable = state().sizable) {
+      sizable->setGeometry(self().geometry().setPosition());
+    }
+    self().doSize();
+
+    //for GTK3: the window will not update after changing widget sizes until sending size-allocate
+    //size-allocate will also call _synchronizeMargin() which is also important for window sizing
+    //GtkAllocation is a typedef of GdkRectangle
+    GtkAllocation rectangle;
+    gtk_widget_get_allocation(widget, &rectangle);
+    g_signal_emit_by_name(G_OBJECT(widget), "size-allocate", &rectangle, (gpointer)this, nullptr);
+  }
+  lastSize = allocation;
+
+  gtk_widget_get_allocation(widget, &allocation);
+  if(allocation.x != lastMove.x || allocation.y != lastMove.y) {
+    state().geometry.setPosition({allocation.x, allocation.y});
+    self().doMove();
+  }
+  lastMove = allocation;
+}
+
+auto pWindow::_synchronizeMargin() -> void {
+  if(locked()) return;
+  auto lock = acquire();
+
+  if(!gtk_widget_get_realized(widget)) return;
+  if(!gtk_widget_get_visible(widget)) return;
+  if(state().fullScreen || state().maximized || state().minimized) return;
+
+  auto window = gtk_widget_get_window(widget);
+  GdkRectangle border, client;
+  gdk_window_get_frame_extents(window, &border);
+  gdk_window_get_origin(window, &client.x, &client.y);
+  #if HIRO_GTK==2
+  gdk_window_get_geometry(window, nullptr, nullptr, &client.width, &client.height, nullptr);
+  #elif HIRO_GTK==3
+  gdk_window_get_geometry(window, nullptr, nullptr, &client.width, &client.height);
+  #endif
+
+  settings.geometry.frameX = client.x - border.x;
+  settings.geometry.frameY = client.y - border.y;
+  settings.geometry.frameWidth  = border.width  - client.width;
+  settings.geometry.frameHeight = border.height - client.height;
+
+  if(gtk_widget_get_visible(gtkMenu)) {
+    GtkAllocation allocation;
+    auto time = chrono::millisecond();
+    while(chrono::millisecond() - time < 20) {
+      gtk_widget_get_allocation(gtkMenu, &allocation);
+      if(allocation.height > 1) {
+        settings.geometry.menuHeight = allocation.height - _menuTextHeight();
+        break;
+      }
+    }
+  }
+
+  if(gtk_widget_get_visible(gtkStatus)) {
+    GtkAllocation allocation;
+    auto time = chrono::millisecond();
+    while(chrono::millisecond() - time < 20) {
+      gtk_widget_get_allocation(gtkStatus, &allocation);
+      if(allocation.height > 1) {
+        settings.geometry.statusHeight = allocation.height - _statusTextHeight();
+        break;
+      }
+    }
+  }
 }
 
 //GTK doesn't add gtk_window_is_maximized() until 3.12;
 //and doesn't appear to have a companion gtk_window_is_(hidden,iconic,minimized);
 //so we have to do this the hard way
 auto pWindow::_synchronizeState() -> void {
+  if(locked()) return;
+  auto lock = acquire();
+
   if(!gtk_widget_get_realized(widget)) return;
 
   #if defined(DISPLAY_WINDOWS)
diff --git a/hiro/gtk/window.hpp b/hiro/gtk/window.hpp
index dd0e1e77..e2ca7a0b 100644
--- a/hiro/gtk/window.hpp
+++ b/hiro/gtk/window.hpp
@@ -5,13 +5,13 @@ namespace hiro {
 struct pWindow : pObject {
   Declare(Window, Object)
 
-  auto append(sLayout layout) -> void;
   auto append(sMenuBar menuBar) -> void;
+  auto append(sSizable sizable) -> void;
   auto append(sStatusBar statusBar) -> void;
   auto focused() const -> bool override;
   auto frameMargin() const -> Geometry;
-  auto remove(sLayout layout) -> void;
   auto remove(sMenuBar menuBar) -> void;
+  auto remove(sSizable sizable) -> void;
   auto remove(sStatusBar statusBar) -> void;
   auto setBackgroundColor(Color color) -> void;
   auto setDismissable(bool dismissable) -> void;
@@ -31,7 +31,8 @@ struct pWindow : pObject {
 
   auto _append(mWidget& widget) -> void;
   auto _append(mMenu& menu) -> void;
-  auto _menuHeight() const -> signed;
+  auto _menuHeight() const -> int;
+  auto _menuTextHeight() const -> int;
   auto _setIcon(const string& basename) -> bool;
   auto _setMenuEnabled(bool enabled) -> void;
   auto _setMenuFont(const Font& font) -> void;
@@ -40,7 +41,10 @@ struct pWindow : pObject {
   auto _setStatusFont(const Font& font) -> void;
   auto _setStatusText(const string& text) -> void;
   auto _setStatusVisible(bool visible) -> void;
-  auto _statusHeight() const -> signed;
+  auto _statusHeight() const -> int;
+  auto _statusTextHeight() const -> int;
+  auto _synchronizeGeometry() -> void;
+  auto _synchronizeMargin() -> void;
   auto _synchronizeState() -> void;
 
   GtkWidget* widget = nullptr;
@@ -49,9 +53,8 @@ struct pWindow : pObject {
   GtkWidget* statusContainer = nullptr;
   GtkWidget* gtkMenu = nullptr;
   GtkWidget* gtkStatus = nullptr;
-  GtkAllocation lastAllocation = {0};
-  Geometry windowedGeometry{128, 128, 256, 256};
-  bool onSizePending = false;
+  GtkAllocation lastMove = {0};
+  GtkAllocation lastSize = {0};
 };
 
 }
diff --git a/hiro/hiro.cpp b/hiro/hiro.cpp
index 9c4a1418..b47225ba 100644
--- a/hiro/hiro.cpp
+++ b/hiro/hiro.cpp
@@ -1,6 +1,8 @@
 #ifndef HIRO_CPP
 #define HIRO_CPP
 
+#define foreach(T, ...) ([&] { for(auto& $ : T) { __VA_ARGS__; }}())
+
 #include "components.hpp"
 #include "core/core.cpp"
 #include "extension/extension.cpp"
diff --git a/hiro/qt/layout.cpp b/hiro/qt/layout.cpp
deleted file mode 100644
index d8b998a5..00000000
--- a/hiro/qt/layout.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-#if defined(Hiro_Layout)
-
-namespace hiro {
-
-auto pLayout::construct() -> void {
-}
-
-auto pLayout::destruct() -> void {
-}
-
-auto pLayout::setVisible(bool visible) -> void {
-  for(auto& sizable : state().sizables) {
-    if(auto self = sizable->self()) self->setVisible(sizable->visible(true));
-  }
-}
-
-}
-
-#endif
diff --git a/hiro/qt/layout.hpp b/hiro/qt/layout.hpp
deleted file mode 100644
index ec8345b1..00000000
--- a/hiro/qt/layout.hpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#if defined(Hiro_Layout)
-
-namespace hiro {
-
-struct pLayout : pSizable {
-  Declare(Layout, Sizable)
-
-  auto setVisible(bool visible) -> void override;
-};
-
-}
-
-#endif
diff --git a/hiro/qt/monitor.cpp b/hiro/qt/monitor.cpp
index 1e0e8db1..abf4773d 100644
--- a/hiro/qt/monitor.cpp
+++ b/hiro/qt/monitor.cpp
@@ -23,6 +23,11 @@ auto pMonitor::primary() -> uint {
   return QApplication::desktop()->primaryScreen();
 }
 
+auto pMonitor::workspace(uint monitor) -> Geometry {
+  //TODO: per-monitor?
+  return pDesktop::workspace();
+}
+
 }
 
 #endif
diff --git a/hiro/qt/monitor.hpp b/hiro/qt/monitor.hpp
index 70cf8a1d..1effa3da 100644
--- a/hiro/qt/monitor.hpp
+++ b/hiro/qt/monitor.hpp
@@ -7,6 +7,7 @@ struct pMonitor {
   static auto dpi(uint monitor) -> Position;
   static auto geometry(uint monitor) -> Geometry;
   static auto primary() -> uint;
+  static auto workspace(uint monitor) -> Geometry;
 };
 
 }
diff --git a/hiro/qt/object.cpp b/hiro/qt/object.cpp
index 3c6ac442..3e93e050 100644
--- a/hiro/qt/object.cpp
+++ b/hiro/qt/object.cpp
@@ -27,6 +27,9 @@ auto pObject::setFocused() -> void {
 auto pObject::setFont(const Font& font) -> void {
 }
 
+auto pObject::setParent(mObject* parent, int offset) -> void {
+}
+
 auto pObject::setVisible(bool visible) -> void {
 }
 
diff --git a/hiro/qt/object.hpp b/hiro/qt/object.hpp
index ade3c070..ae3f1af3 100644
--- a/hiro/qt/object.hpp
+++ b/hiro/qt/object.hpp
@@ -2,7 +2,7 @@
 
 namespace hiro {
 
-struct pObject {
+struct pObject : mLock {
   pObject(mObject& reference) : reference(reference) {}
   virtual ~pObject() {}
   auto self() const -> mObject& { return (mObject&)reference; }
@@ -16,14 +16,10 @@ struct pObject {
   virtual auto setEnabled(bool enabled) -> void;
   virtual auto setFocused() -> void;
   virtual auto setFont(const Font& font) -> void;
+  virtual auto setParent(mObject* parent, int offset) -> void;
   virtual auto setVisible(bool visible) -> void;
 
-  auto locked() const -> bool { return locks != 0 || Application::state.quit; }
-  auto lock() -> void { locks++; }
-  auto unlock() -> void { locks--; }
-
   mObject& reference;
-  signed locks = 0;
 };
 
 }
diff --git a/hiro/qt/platform.cpp b/hiro/qt/platform.cpp
index d062a0a7..6bb2e877 100644
--- a/hiro/qt/platform.cpp
+++ b/hiro/qt/platform.cpp
@@ -30,7 +30,6 @@
 #include "action/menu-radio-item.cpp"
 
 #include "sizable.cpp"
-#include "layout.cpp"
 
 #include "widget/widget.cpp"
 #include "widget/button.cpp"
diff --git a/hiro/qt/platform.hpp b/hiro/qt/platform.hpp
index c54b5634..517eb4bc 100644
--- a/hiro/qt/platform.hpp
+++ b/hiro/qt/platform.hpp
@@ -33,7 +33,6 @@
 #include "action/menu-radio-item.hpp"
 
 #include "sizable.hpp"
-#include "layout.hpp"
 
 #include "widget/widget.hpp"
 #include "widget/button.hpp"
diff --git a/hiro/qt/settings.hpp b/hiro/qt/settings.hpp
index 4223095c..eca6181b 100644
--- a/hiro/qt/settings.hpp
+++ b/hiro/qt/settings.hpp
@@ -11,8 +11,8 @@ struct Settings {
     int frameY = 24;
     int frameWidth = 8;
     int frameHeight = 28;
-    int menuHeight = 20;
-    int statusHeight = 20;
+    int menuHeight = 9;
+    int statusHeight = 9;
   } geometry;
 };
 
diff --git a/hiro/qt/widget/combo-button-item.cpp b/hiro/qt/widget/combo-button-item.cpp
index a38266a4..5f1f9cc2 100644
--- a/hiro/qt/widget/combo-button-item.cpp
+++ b/hiro/qt/widget/combo-button-item.cpp
@@ -40,6 +40,7 @@ auto pComboButtonItem::_parent() -> maybe<pComboButton&> {
 
 auto pComboButtonItem::_setState() -> void {
   if(auto parent = _parent()) {
+    auto lock = parent->acquire();
     parent->qtComboButton->setItemIcon(self().offset(), CreateIcon(state().icon));
     if(state().selected) parent->qtComboButton->setCurrentIndex(self().offset());
     parent->qtComboButton->setItemText(self().offset(), QString::fromUtf8(state().text));
diff --git a/hiro/qt/widget/combo-button.cpp b/hiro/qt/widget/combo-button.cpp
index 88b75f3b..ea0fedee 100644
--- a/hiro/qt/widget/combo-button.cpp
+++ b/hiro/qt/widget/combo-button.cpp
@@ -30,9 +30,8 @@ auto pComboButton::remove(sComboButtonItem item) -> void {
 }
 
 auto pComboButton::reset() -> void {
-  lock();
+  auto lock = acquire();
   while(qtComboButton->count()) qtComboButton->removeItem(0);
-  unlock();
 }
 
 auto QtComboButton::onChange(int offset) -> void {
diff --git a/hiro/qt/widget/frame.cpp b/hiro/qt/widget/frame.cpp
index 2ffd8075..fe3a8d42 100644
--- a/hiro/qt/widget/frame.cpp
+++ b/hiro/qt/widget/frame.cpp
@@ -22,23 +22,23 @@ auto pFrame::destruct() -> void {
   qtWidget = qtFrame = nullptr;
 }
 
-auto pFrame::append(sLayout layout) -> void {
+auto pFrame::append(sSizable sizable) -> void {
 }
 
-auto pFrame::remove(sLayout layout) -> void {
+auto pFrame::remove(sSizable sizable) -> void {
 }
 
 auto pFrame::setEnabled(bool enabled) -> void {
-  if(auto layout = state().layout) layout->setEnabled(layout->enabled(true));
+  if(auto& sizable = state().sizable) sizable->setEnabled(sizable->enabled());
   pWidget::setEnabled(enabled);
 }
 
 auto pFrame::setGeometry(Geometry geometry) -> void {
   pWidget::setGeometry(geometry);
-  if(auto layout = state().layout) {
+  if(auto& sizable = state().sizable) {
     auto size = pFont::size(qtFrame->font(), state().text);
     if(!state().text) size.setHeight(8);
-    layout->setGeometry({
+    sizable->setGeometry({
       4, size.height(),
       geometry.width() - 8,
       geometry.height() - size.height() - 4
@@ -51,7 +51,7 @@ auto pFrame::setText(const string& text) -> void {
 }
 
 auto pFrame::setVisible(bool visible) -> void {
-  if(auto layout = state().layout) layout->setVisible(layout->visible(true));
+  if(auto& sizable = state().sizable) sizable->setVisible(sizable->visible());
   pWidget::setVisible(visible);
 }
 
diff --git a/hiro/qt/widget/frame.hpp b/hiro/qt/widget/frame.hpp
index b58e3044..9bca1fe1 100644
--- a/hiro/qt/widget/frame.hpp
+++ b/hiro/qt/widget/frame.hpp
@@ -5,8 +5,8 @@ namespace hiro {
 struct pFrame : pWidget {
   Declare(Frame, Widget)
 
-  auto append(sLayout layout) -> void;
-  auto remove(sLayout layout) -> void;
+  auto append(sSizable sizable) -> void;
+  auto remove(sSizable sizable) -> void;
   auto setEnabled(bool enabled) -> void override;
   auto setGeometry(Geometry geometry) -> void override;
   auto setText(const string& text) -> void;
diff --git a/hiro/qt/widget/tab-frame-item.cpp b/hiro/qt/widget/tab-frame-item.cpp
index 72d8ca73..bcc1e2f2 100644
--- a/hiro/qt/widget/tab-frame-item.cpp
+++ b/hiro/qt/widget/tab-frame-item.cpp
@@ -15,22 +15,22 @@ auto pTabFrameItem::construct() -> void {
 auto pTabFrameItem::destruct() -> void {
 }
 
-auto pTabFrameItem::append(sLayout layout) -> void {
+auto pTabFrameItem::append(sSizable sizable) -> void {
 }
 
-auto pTabFrameItem::remove(sLayout layout) -> void {
+auto pTabFrameItem::remove(sSizable sizable) -> void {
 }
 
 auto pTabFrameItem::setClosable(bool closable) -> void {
 }
 
 auto pTabFrameItem::setGeometry(Geometry geometry) -> void {
-  if(auto layout = state().layout) {
+  if(auto& sizable = state().sizable) {
     auto offset = qtTabFrameItem->geometry();
     geometry.setPosition({0, 0});
     geometry.setWidth(geometry.width() - (geometry.width() - offset.width()));
     geometry.setHeight(geometry.height() - (geometry.height() - offset.height()));
-    layout->setGeometry(geometry);
+    sizable->setGeometry(geometry);
   }
 }
 
@@ -65,14 +65,14 @@ auto pTabFrameItem::_setState() -> void {
     parent->qtTabFrame->setTabIcon(self().offset(), CreateIcon(state().icon));
     if(state().selected) parent->qtTabFrame->setCurrentIndex(self().offset());
     parent->qtTabFrame->setTabText(self().offset(), QString::fromUtf8(state().text));
-    if(auto layout = state().layout) {
+    if(auto& sizable = state().sizable) {
       auto geometry = parent->self().geometry();
       auto offset = qtTabFrameItem->geometry();
       geometry.setPosition({0, 0});
       geometry.setWidth(geometry.width() - (geometry.width() - offset.width()));
       geometry.setHeight(geometry.height() - (geometry.height() - offset.height()));
-      layout->setGeometry(geometry);
-      layout->setVisible(layout->visible(true));
+      sizable->setGeometry(geometry);
+      sizable->setVisible(sizable->visible(true));
     }
   }
 }
diff --git a/hiro/qt/widget/tab-frame-item.hpp b/hiro/qt/widget/tab-frame-item.hpp
index 4b8d59c8..baff8601 100644
--- a/hiro/qt/widget/tab-frame-item.hpp
+++ b/hiro/qt/widget/tab-frame-item.hpp
@@ -5,8 +5,8 @@ namespace hiro {
 struct pTabFrameItem : pObject {
   Declare(TabFrameItem, Object)
 
-  auto append(sLayout layout) -> void;
-  auto remove(sLayout layout) -> void;
+  auto append(sSizable sizable) -> void;
+  auto remove(sSizable sizable) -> void;
   auto setClosable(bool closable) -> void;
   auto setIcon(const image& icon) -> void;
   auto setGeometry(Geometry geometry) -> void;
diff --git a/hiro/qt/widget/table-view-cell.cpp b/hiro/qt/widget/table-view-cell.cpp
index 29138a77..abcc471c 100644
--- a/hiro/qt/widget/table-view-cell.cpp
+++ b/hiro/qt/widget/table-view-cell.cpp
@@ -50,7 +50,7 @@ auto pTableViewCell::_parent() -> maybe<pTableViewItem&> {
 auto pTableViewCell::_setState() -> void {
   if(auto parent = _parent()) {
     if(auto grandparent = parent->_parent()) {
-      grandparent->lock();
+      auto lock = grandparent->acquire();
       parent->qtItem->setBackground(self().offset(), CreateBrush(self().backgroundColor(true)));
       if(state().checkable) {
         parent->qtItem->setCheckState(self().offset(), state().checked ? Qt::Checked : Qt::Unchecked);
@@ -63,7 +63,6 @@ auto pTableViewCell::_setState() -> void {
       parent->qtItem->setIcon(self().offset(), CreateIcon(state().icon));
       parent->qtItem->setText(self().offset(), QString::fromUtf8(state().text));
       parent->qtItem->setTextAlignment(self().offset(), CalculateAlignment(self().alignment(true)));
-      grandparent->unlock();
     }
   }
 }
diff --git a/hiro/qt/widget/table-view-column.cpp b/hiro/qt/widget/table-view-column.cpp
index 58e7c35f..d5a5419d 100644
--- a/hiro/qt/widget/table-view-column.cpp
+++ b/hiro/qt/widget/table-view-column.cpp
@@ -44,6 +44,10 @@ auto pTableViewColumn::setIcon(const image& icon) -> void {
   //unsupported
 }
 
+auto pTableViewColumn::setParent(mObject* parent, int offset) -> void {
+  if(auto header = _parent()) header->_setState();
+}
+
 auto pTableViewColumn::setResizable(bool resizable) -> void {
   _setState();
 }
@@ -78,6 +82,7 @@ auto pTableViewColumn::_parent() -> maybe<pTableViewHeader&> {
 auto pTableViewColumn::_setState() -> void {
   if(auto header = _parent()) {
     if(auto parent = header->_parent()) {
+      auto lock = parent->acquire();
       #if HIRO_QT==4
       parent->qtTableView->header()->setResizeMode(self().offset(), state().resizable ? QHeaderView::Interactive : QHeaderView::Fixed);
       #elif HIRO_QT==5
diff --git a/hiro/qt/widget/table-view-column.hpp b/hiro/qt/widget/table-view-column.hpp
index f3933e11..1519ce6b 100644
--- a/hiro/qt/widget/table-view-column.hpp
+++ b/hiro/qt/widget/table-view-column.hpp
@@ -14,6 +14,7 @@ struct pTableViewColumn : pObject {
   auto setForegroundColor(Color color) -> void;
   auto setHorizontalAlignment(double alignment) -> void;
   auto setIcon(const image& icon) -> void;
+  auto setParent(mObject* parent, int offset) -> void override;
   auto setResizable(bool resizable) -> void;
   auto setSortable(bool sortable) -> void;
   auto setText(const string& text) -> void;
diff --git a/hiro/qt/widget/table-view-header.cpp b/hiro/qt/widget/table-view-header.cpp
index 2a835c1f..b01d2ba6 100644
--- a/hiro/qt/widget/table-view-header.cpp
+++ b/hiro/qt/widget/table-view-header.cpp
@@ -13,7 +13,6 @@ auto pTableViewHeader::append(sTableViewColumn column) -> void {
 }
 
 auto pTableViewHeader::remove(sTableViewColumn column) -> void {
-  _setState();
 }
 
 auto pTableViewHeader::setVisible(bool visible) -> void {
@@ -29,6 +28,7 @@ auto pTableViewHeader::_parent() -> maybe<pTableView&> {
 
 auto pTableViewHeader::_setState() -> void {
   if(auto parent = _parent()) {
+    auto lock = parent->acquire();
   //parent->qtTableView->setAlternatingRowColors(self().columnCount() >= 2);
     parent->qtTableView->setColumnCount(self().columnCount());
     parent->qtTableView->setHeaderHidden(!self().visible());
diff --git a/hiro/qt/widget/table-view-item.cpp b/hiro/qt/widget/table-view-item.cpp
index 8635b0f9..a8ddbc62 100644
--- a/hiro/qt/widget/table-view-item.cpp
+++ b/hiro/qt/widget/table-view-item.cpp
@@ -6,12 +6,13 @@ auto pTableViewItem::construct() -> void {
 }
 
 auto pTableViewItem::destruct() -> void {
-  if(auto parent = _parent()) parent->lock();
-  if(qtItem) {
-    delete qtItem;
-    qtItem = nullptr;
+  if(auto parent = _parent()) {
+    auto lock = parent->acquire();
+    if(qtItem) {
+      delete qtItem;
+      qtItem = nullptr;
+    }
   }
-  if(auto parent = _parent()) parent->unlock();
 }
 
 auto pTableViewItem::append(sTableViewCell cell) -> void {
@@ -51,6 +52,7 @@ auto pTableViewItem::_parent() -> maybe<pTableView&> {
 
 auto pTableViewItem::_setState() -> void {
   if(auto parent = _parent()) {
+    parent->lock();
     qtItem->setSelected(state().selected);
     if(state().selected) {
       parent->qtTableView->setCurrentItem(qtItem);
diff --git a/hiro/qt/widget/table-view.cpp b/hiro/qt/widget/table-view.cpp
index 877866ee..8c79158e 100644
--- a/hiro/qt/widget/table-view.cpp
+++ b/hiro/qt/widget/table-view.cpp
@@ -146,7 +146,7 @@ auto pTableView::_width(unsigned column) -> unsigned {
     unsigned width = 1;
     if(!header->column(column).visible()) return width;
     if(header->visible()) width = max(width, _widthOfColumn(column));
-    for(auto row : range(state().items)) {
+    for(auto row : range(state().items.size())) {
       width = max(width, _widthOfCell(row, column));
     }
     return width;
diff --git a/hiro/qt/window.cpp b/hiro/qt/window.cpp
index 8f8a5f22..27a0ab1b 100644
--- a/hiro/qt/window.cpp
+++ b/hiro/qt/window.cpp
@@ -51,10 +51,10 @@ auto pWindow::destruct() -> void {
   delete qtWindow;
 }
 
-auto pWindow::append(sLayout layout) -> void {
+auto pWindow::append(sMenuBar menuBar) -> void {
 }
 
-auto pWindow::append(sMenuBar menuBar) -> void {
+auto pWindow::append(sSizable sizable) -> void {
 }
 
 auto pWindow::append(sStatusBar statusBar) -> void {
@@ -77,15 +77,15 @@ auto pWindow::frameMargin() const -> Geometry {
   };
 }
 
-auto pWindow::remove(sLayout layout) -> void {
-}
-
 auto pWindow::remove(sMenuBar menuBar) -> void {
   //QMenuBar::removeMenu() does not exist
   //qtMenu->clear();
   //for(auto& menu : window.state.menu) append(menu);
 }
 
+auto pWindow::remove(sSizable sizable) -> void {
+}
+
 auto pWindow::remove(sStatusBar statusBar) -> void {
 }
 
@@ -219,12 +219,32 @@ auto pWindow::_append(mWidget& widget) -> void {
   }
 }
 
-auto pWindow::_menuHeight() const -> signed {
-  return qtMenuBar->isVisible() ? settings.geometry.menuHeight : 0;
+auto pWindow::_menuHeight() const -> uint {
+  if(!qtMenuBar->isVisible()) return 0;
+  return settings.geometry.menuHeight + _menuTextHeight();
 }
 
-auto pWindow::_statusHeight() const -> signed {
-  return qtStatusBar->isVisible() ? settings.geometry.statusHeight : 0;
+auto pWindow::_menuTextHeight() const -> uint {
+  uint height = 0;
+  if(auto& menuBar = state().menuBar) {
+    for(auto& menu : menuBar->state.menus) {
+      height = max(height, menu->font(true).size(menu->text()).height());
+    }
+  }
+  return height;
+}
+
+auto pWindow::_statusHeight() const -> uint {
+  if(!qtStatusBar->isVisible()) return 0;
+  return settings.geometry.statusHeight + _statusTextHeight();
+}
+
+auto pWindow::_statusTextHeight() const -> uint {
+  uint height = 0;
+  if(auto& statusBar = state().statusBar) {
+    height = statusBar->font(true).size(statusBar->text()).height();
+  }
+  return height;
 }
 
 auto pWindow::_updateFrameGeometry() -> void {
@@ -239,12 +259,12 @@ auto pWindow::_updateFrameGeometry() -> void {
 
   if(qtMenuBar->isVisible()) {
     pApplication::syncX();
-    settings.geometry.menuHeight = qtMenuBar->height();
+    settings.geometry.menuHeight = qtMenuBar->height() - _menuTextHeight();
   }
 
   if(qtStatusBar->isVisible()) {
     pApplication::syncX();
-    settings.geometry.statusHeight = qtStatusBar->height();
+    settings.geometry.statusHeight = qtStatusBar->height() - _statusTextHeight();
   }
 }
 
@@ -302,8 +322,8 @@ auto QtWindow::resizeEvent(QResizeEvent*) -> void {
     });
   }
 
-  if(auto& layout = p.state().layout) {
-    layout->setGeometry(p.self().geometry().setPosition(0, 0));
+  if(auto& sizable = p.state().sizable) {
+    sizable->setGeometry(p.self().geometry().setPosition());
   }
 
   if(!p.locked()) {
@@ -312,8 +332,8 @@ auto QtWindow::resizeEvent(QResizeEvent*) -> void {
 }
 
 auto QtWindow::sizeHint() const -> QSize {
-  unsigned width = p.state().geometry.width();
-  unsigned height = p.state().geometry.height();
+  uint width = p.state().geometry.width();
+  uint height = p.state().geometry.height();
   if(p.qtMenuBar->isVisible()) height += settings.geometry.menuHeight;
   if(p.qtStatusBar->isVisible()) height += settings.geometry.statusHeight;
   return QSize(width, height);
diff --git a/hiro/qt/window.hpp b/hiro/qt/window.hpp
index da618263..e2daeb4b 100644
--- a/hiro/qt/window.hpp
+++ b/hiro/qt/window.hpp
@@ -5,13 +5,13 @@ namespace hiro {
 struct pWindow : pObject {
   Declare(Window, Object)
 
-  auto append(sLayout layout) -> void;
   auto append(sMenuBar menuBar) -> void;
+  auto append(sSizable sizable) -> void;
   auto append(sStatusBar statusBar) -> void;
   auto focused() const -> bool override;
   auto frameMargin() const -> Geometry;
-  auto remove(sLayout layout) -> void;
   auto remove(sMenuBar menuBar) -> void;
+  auto remove(sSizable sizable) -> void;
   auto remove(sStatusBar statusBar) -> void;
   auto setBackgroundColor(Color color) -> void;
   auto setDismissable(bool dismissable) -> void;
@@ -30,8 +30,10 @@ struct pWindow : pObject {
   auto setVisible(bool visible) -> void;
 
   auto _append(mWidget& widget) -> void;
-  auto _menuHeight() const -> signed;
-  auto _statusHeight() const -> signed;
+  auto _menuHeight() const -> uint;
+  auto _menuTextHeight() const -> uint;
+  auto _statusHeight() const -> uint;
+  auto _statusTextHeight() const -> uint;
   auto _updateFrameGeometry() -> void;
 
   QtWindow* qtWindow = nullptr;
diff --git a/hiro/windows/layout.cpp b/hiro/windows/layout.cpp
deleted file mode 100644
index fbd3dcd4..00000000
--- a/hiro/windows/layout.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#if defined(Hiro_Layout)
-
-namespace hiro {
-
-auto pLayout::construct() -> void {
-}
-
-auto pLayout::destruct() -> void {
-}
-
-auto pLayout::setEnabled(bool enabled) -> void {
-  for(auto& sizable : state().sizables) {
-    if(auto self = sizable->self()) self->setEnabled(sizable->enabled(true));
-  }
-}
-
-auto pLayout::setFont(const Font& font) -> void {
-  for(auto& sizable : state().sizables) {
-    if(auto self = sizable->self()) self->setFont(sizable->font(true));
-  }
-}
-
-auto pLayout::setVisible(bool visible) -> void {
-  for(auto& sizable : state().sizables) {
-    if(auto self = sizable->self()) self->setVisible(sizable->visible(true));
-  }
-}
-
-}
-
-#endif
diff --git a/hiro/windows/layout.hpp b/hiro/windows/layout.hpp
deleted file mode 100644
index dba11836..00000000
--- a/hiro/windows/layout.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#if defined(Hiro_Layout)
-
-namespace hiro {
-
-struct pLayout : pSizable {
-  Declare(Layout, Sizable)
-
-  auto setEnabled(bool enabled) -> void override;
-  auto setFont(const Font& font) -> void override;
-  auto setVisible(bool visible) -> void override;
-};
-
-}
-
-#endif
diff --git a/hiro/windows/monitor.cpp b/hiro/windows/monitor.cpp
index 5ade851a..baca8f08 100644
--- a/hiro/windows/monitor.cpp
+++ b/hiro/windows/monitor.cpp
@@ -1,5 +1,7 @@
 #if defined(Hiro_Monitor)
 
+//per-monitor API is only on Windows 10+
+
 namespace hiro {
 
 struct MonitorInfo {
@@ -49,6 +51,10 @@ auto pMonitor::primary() -> uint {
   return info.primary;
 }
 
+auto pMonitor::workspace(uint monitor) -> Geometry {
+  return pDesktop::workspace();
+}
+
 }
 
 #endif
diff --git a/hiro/windows/monitor.hpp b/hiro/windows/monitor.hpp
index 70cf8a1d..1effa3da 100644
--- a/hiro/windows/monitor.hpp
+++ b/hiro/windows/monitor.hpp
@@ -7,6 +7,7 @@ struct pMonitor {
   static auto dpi(uint monitor) -> Position;
   static auto geometry(uint monitor) -> Geometry;
   static auto primary() -> uint;
+  static auto workspace(uint monitor) -> Geometry;
 };
 
 }
diff --git a/hiro/windows/object.cpp b/hiro/windows/object.cpp
index 4cf170d7..02afbbf0 100644
--- a/hiro/windows/object.cpp
+++ b/hiro/windows/object.cpp
@@ -33,6 +33,9 @@ auto pObject::setFont(const Font& font) -> void {
 auto pObject::setGroup(sGroup group) -> void {
 }
 
+auto pObject::setParent(mObject* parent, int offset) -> void {
+}
+
 auto pObject::setVisible(bool visible) -> void {
 }
 
diff --git a/hiro/windows/object.hpp b/hiro/windows/object.hpp
index 0b8d3eb1..4fefe84f 100644
--- a/hiro/windows/object.hpp
+++ b/hiro/windows/object.hpp
@@ -2,7 +2,7 @@
 
 namespace hiro {
 
-struct pObject {
+struct pObject : mLock {
   pObject(mObject& reference) : reference(reference) {}
   virtual ~pObject() = default;
   virtual auto construct() -> void;
@@ -16,14 +16,10 @@ struct pObject {
   virtual auto setFocused() -> void;
   virtual auto setFont(const Font& font) -> void;
   virtual auto setGroup(sGroup group) -> void;
+  virtual auto setParent(mObject* parent, int offset) -> void;
   virtual auto setVisible(bool visible) -> void;
 
-  auto locked() const -> bool { return locks != 0 || Application::state.quit; }
-  auto lock() -> void { ++locks; }
-  auto unlock() -> void { --locks; }
-
   mObject& reference;
-  signed locks = 0;
 };
 
 }
diff --git a/hiro/windows/platform.cpp b/hiro/windows/platform.cpp
index 799c8a43..be079a6a 100644
--- a/hiro/windows/platform.cpp
+++ b/hiro/windows/platform.cpp
@@ -26,7 +26,6 @@
 #include "action/menu-radio-item.cpp"
 
 #include "sizable.cpp"
-#include "layout.cpp"
 
 #include "widget/widget.cpp"
 #include "widget/button.cpp"
diff --git a/hiro/windows/platform.hpp b/hiro/windows/platform.hpp
index 36a4e1ed..aef70747 100644
--- a/hiro/windows/platform.hpp
+++ b/hiro/windows/platform.hpp
@@ -8,7 +8,7 @@ struct pLayout;
 struct pWidget;
 
 struct AppMessage {
-  enum : unsigned {
+  enum : uint {
     None = WM_APP,
     TableView_doPaint,
     TableView_onActivate,
@@ -55,7 +55,6 @@ static vector<wObject> windows;
 #include "action/menu-radio-item.hpp"
 
 #include "sizable.hpp"
-#include "layout.hpp"
 
 #include "widget/widget.hpp"
 #include "widget/button.hpp"
diff --git a/hiro/windows/widget/frame.cpp b/hiro/windows/widget/frame.cpp
index 8ae4584c..7375bd18 100644
--- a/hiro/windows/widget/frame.cpp
+++ b/hiro/windows/widget/frame.cpp
@@ -15,14 +15,14 @@ auto pFrame::destruct() -> void {
   DestroyWindow(hwnd);
 }
 
-auto pFrame::append(sLayout layout) -> void {
+auto pFrame::append(sSizable sizable) -> void {
 }
 
-auto pFrame::remove(sLayout layout) -> void {
+auto pFrame::remove(sSizable sizable) -> void {
 }
 
 auto pFrame::setEnabled(bool enabled) -> void {
-  if(auto layout = state().layout) layout->setEnabled(layout->enabled());
+  if(auto& sizable = state().sizable) sizable->setEnabled(sizable->enabled());
   pWidget::setEnabled(enabled);
 }
 
@@ -35,9 +35,9 @@ auto pFrame::setGeometry(Geometry geometry) -> void {
     geometry.width(),
     geometry.height() + (empty ? size.height() / 2 : 0)
   });
-  if(auto layout = state().layout) {
+  if(auto& sizable = state().sizable) {
     if(empty) size.setHeight(1);
-    layout->setGeometry({
+    sizable->setGeometry({
       geometry.x() + 1,
       geometry.y() + size.height(),
       geometry.width() - 2,
@@ -51,7 +51,7 @@ auto pFrame::setText(const string& text) -> void {
 }
 
 auto pFrame::setVisible(bool visible) -> void {
-  if(auto layout = state().layout) layout->setVisible(layout->visible());
+  if(auto& sizable = state().sizable) sizable->setVisible(sizable->visible());
   pWidget::setVisible(visible);
 }
 
diff --git a/hiro/windows/widget/frame.hpp b/hiro/windows/widget/frame.hpp
index 7587893e..18c5bffd 100644
--- a/hiro/windows/widget/frame.hpp
+++ b/hiro/windows/widget/frame.hpp
@@ -5,8 +5,8 @@ namespace hiro {
 struct pFrame : pWidget {
   Declare(Frame, Widget)
 
-  auto append(sLayout layout) -> void;
-  auto remove(sLayout layout) -> void;
+  auto append(sSizable sizable) -> void;
+  auto remove(sSizable sizable) -> void;
   auto setEnabled(bool enabled) -> void override;
   auto setGeometry(Geometry geometry) -> void override;
   auto setText(const string& text) -> void;
diff --git a/hiro/windows/widget/tab-frame-item.cpp b/hiro/windows/widget/tab-frame-item.cpp
index 2583d648..107bece4 100644
--- a/hiro/windows/widget/tab-frame-item.cpp
+++ b/hiro/windows/widget/tab-frame-item.cpp
@@ -8,15 +8,15 @@ auto pTabFrameItem::construct() -> void {
 auto pTabFrameItem::destruct() -> void {
 }
 
-auto pTabFrameItem::append(sLayout layout) -> void {
+auto pTabFrameItem::append(sSizable sizable) -> void {
   if(auto parent = _parent()) {
-    parent->_synchronizeLayout();
+    parent->_synchronizeSizable();
   }
 }
 
-auto pTabFrameItem::remove(sLayout layout) -> void {
+auto pTabFrameItem::remove(sSizable sizable) -> void {
   if(auto parent = _parent()) {
-    parent->_synchronizeLayout();
+    parent->_synchronizeSizable();
   }
 }
 
@@ -37,7 +37,7 @@ auto pTabFrameItem::setMovable(bool movable) -> void {
 auto pTabFrameItem::setSelected() -> void {
   if(auto parent = _parent()) {
     TabCtrl_SetCurSel(parent->hwnd, self().offset());
-    parent->_synchronizeLayout();
+    parent->_synchronizeSizable();
   }
 }
 
diff --git a/hiro/windows/widget/tab-frame-item.hpp b/hiro/windows/widget/tab-frame-item.hpp
index d08a2696..400db35f 100644
--- a/hiro/windows/widget/tab-frame-item.hpp
+++ b/hiro/windows/widget/tab-frame-item.hpp
@@ -5,8 +5,8 @@ namespace hiro {
 struct pTabFrameItem : pObject {
   Declare(TabFrameItem, Object)
 
-  auto append(sLayout layout) -> void;
-  auto remove(sLayout layout) -> void;
+  auto append(sSizable sizable) -> void;
+  auto remove(sSizable sizable) -> void;
   auto setClosable(bool closable) -> void;
   auto setIcon(const image& icon) -> void;
   auto setMovable(bool movable) -> void;
diff --git a/hiro/windows/widget/tab-frame.cpp b/hiro/windows/widget/tab-frame.cpp
index 58abbd26..5700f7f4 100644
--- a/hiro/windows/widget/tab-frame.cpp
+++ b/hiro/windows/widget/tab-frame.cpp
@@ -45,7 +45,7 @@ auto pTabFrame::append(sTabFrameItem item) -> void {
     if(item->selected()) self->setSelected();
   }
   _buildImageList();
-  _synchronizeLayout();
+  _synchronizeSizable();
 }
 
 auto pTabFrame::remove(sTabFrameItem item) -> void {
@@ -56,8 +56,8 @@ auto pTabFrame::remove(sTabFrameItem item) -> void {
 auto pTabFrame::setEnabled(bool enabled) -> void {
   pWidget::setEnabled(enabled);
   for(auto& item : state().items) {
-    if(auto layout = item->state.layout) {
-      if(auto self = layout->self()) self->setEnabled(layout->enabled(true));
+    if(auto& sizable = item->state.sizable) {
+      if(auto self = sizable->self()) self->setEnabled(sizable->enabled());
     }
   }
 }
@@ -69,8 +69,8 @@ auto pTabFrame::setGeometry(Geometry geometry) -> void {
   geometry.setWidth(geometry.width() - 4);
   geometry.setHeight(geometry.height() - 23);
   for(auto& item : state().items) {
-    if(auto layout = item->state.layout) {
-      layout->setGeometry(geometry);
+    if(auto& sizable = item->state.sizable) {
+      sizable->setGeometry(geometry);
     }
   }
 }
@@ -82,8 +82,8 @@ auto pTabFrame::setNavigation(Navigation navigation) -> void {
 auto pTabFrame::setVisible(bool visible) -> void {
   pWidget::setVisible(visible);
   for(auto& item : state().items) {
-    if(auto layout = item->state.layout) {
-      if(auto self = layout->self()) self->setVisible(layout->visible(true));
+    if(auto& sizable = item->state.sizable) {
+      if(auto self = sizable->self()) self->setVisible(sizable->visible(true));
     }
   }
 }
@@ -97,7 +97,7 @@ auto pTabFrame::_buildImageList() -> void {
     ImageList_Append(imageList, item->state.icon, size);
   }
   TabCtrl_SetImageList(hwnd, imageList);
-  for(auto offset : range(state().items)) {
+  for(auto offset : range(state().items.size())) {
     TCITEM tcItem;
     tcItem.mask = TCIF_IMAGE;
     tcItem.iImage = state().items[offset]->state.icon ? offset : -1;
@@ -105,10 +105,10 @@ auto pTabFrame::_buildImageList() -> void {
   }
 }
 
-auto pTabFrame::_synchronizeLayout() -> void {
+auto pTabFrame::_synchronizeSizable() -> void {
   for(auto& item : state().items) {
-    if(auto layout = item->state.layout) {
-      layout->setVisible(item->selected());
+    if(auto& sizable = item->state.sizable) {
+      sizable->setVisible(item->selected());
     }
   }
 }
@@ -117,7 +117,7 @@ auto pTabFrame::onChange() -> void {
   unsigned selected = TabCtrl_GetCurSel(hwnd);
   for(auto& item : state().items) item->state.selected = false;
   if(auto item = self().item(selected)) item->state.selected = true;
-  _synchronizeLayout();
+  _synchronizeSizable();
   self().doChange();
 }
 
diff --git a/hiro/windows/widget/tab-frame.hpp b/hiro/windows/widget/tab-frame.hpp
index e2356a6b..a96a1723 100644
--- a/hiro/windows/widget/tab-frame.hpp
+++ b/hiro/windows/widget/tab-frame.hpp
@@ -16,7 +16,7 @@ struct pTabFrame : pWidget {
   auto onDrawItem(LPARAM lparam) -> void;
 
   auto _buildImageList() -> void;
-  auto _synchronizeLayout() -> void;
+  auto _synchronizeSizable() -> void;
 
   WindowProc windowProc = nullptr;
   HIMAGELIST imageList = nullptr;
diff --git a/hiro/windows/widget/table-view.cpp b/hiro/windows/widget/table-view.cpp
index 8ee4e221..cd6f94d9 100644
--- a/hiro/windows/widget/table-view.cpp
+++ b/hiro/windows/widget/table-view.cpp
@@ -428,7 +428,7 @@ auto pTableView::_width(unsigned column) -> unsigned {
     if(auto width = header->state.columns[column]->width()) return width;
     unsigned width = 1;
     if(header->visible()) width = max(width, _columnWidth(column));
-    for(auto row : range(state().items)) {
+    for(auto row : range(state().items.size())) {
       width = max(width, _cellWidth(row, column));
     }
     return width;
diff --git a/hiro/windows/window.cpp b/hiro/windows/window.cpp
index 7866b687..0832f3f0 100644
--- a/hiro/windows/window.cpp
+++ b/hiro/windows/window.cpp
@@ -2,8 +2,8 @@
 
 namespace hiro {
 
-static const unsigned FixedStyle = WS_SYSMENU | WS_CAPTION | WS_MINIMIZEBOX | WS_BORDER | WS_CLIPCHILDREN;
-static const unsigned ResizableStyle = WS_SYSMENU | WS_CAPTION | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_THICKFRAME | WS_CLIPCHILDREN;
+static const uint FixedStyle = WS_SYSMENU | WS_CAPTION | WS_MINIMIZEBOX | WS_BORDER | WS_CLIPCHILDREN;
+static const uint ResizableStyle = WS_SYSMENU | WS_CAPTION | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_THICKFRAME | WS_CLIPCHILDREN;
 
 auto pWindow::construct() -> void {
   hwnd = CreateWindow(L"hiroWindow", L"", ResizableStyle, 128, 128, 256, 256, 0, 0, GetModuleHandle(0), 0);
@@ -21,10 +21,10 @@ auto pWindow::destruct() -> void {
   DestroyWindow(hwnd);
 }
 
-auto pWindow::append(sLayout layout) -> void {
+auto pWindow::append(sMenuBar menuBar) -> void {
 }
 
-auto pWindow::append(sMenuBar menuBar) -> void {
+auto pWindow::append(sSizable sizable) -> void {
 }
 
 auto pWindow::append(sStatusBar statusBar) -> void {
@@ -40,7 +40,7 @@ auto pWindow::frameMargin() const -> Geometry {
   RECT rc{0, 0, 640, 480};
   AdjustWindowRect(&rc, style, (bool)GetMenu(hwnd));
   signed statusHeight = 0;
-  if(auto statusBar = state().statusBar) {
+  if(auto& statusBar = state().statusBar) {
     if(auto self = statusBar->self()) {
       if(statusBar->visible()) {
         RECT src;
@@ -52,10 +52,10 @@ auto pWindow::frameMargin() const -> Geometry {
   return {abs(rc.left), abs(rc.top), (rc.right - rc.left) - 640, (rc.bottom - rc.top) + statusHeight - 480};
 }
 
-auto pWindow::remove(sLayout layout) -> void {
+auto pWindow::remove(sMenuBar menuBar) -> void {
 }
 
-auto pWindow::remove(sMenuBar menuBar) -> void {
+auto pWindow::remove(sSizable sizable) -> void {
 }
 
 auto pWindow::remove(sStatusBar statusBar) -> void {
@@ -75,8 +75,8 @@ auto pWindow::setDroppable(bool droppable) -> void {
 }
 
 auto pWindow::setEnabled(bool enabled) -> void {
-  if(auto layout = state().layout) {
-    if(auto self = layout->self()) self->setEnabled(layout->enabled(true));
+  if(auto& sizable = state().sizable) {
+    if(auto self = sizable->self()) self->setEnabled(sizable->enabled(true));
   }
 }
 
@@ -86,8 +86,8 @@ auto pWindow::setFocused() -> void {
 }
 
 auto pWindow::setFont(const Font& font) -> void {
-  if(auto layout = state().layout) {
-    if(auto self = layout->self()) self->setFont(layout->font(true));
+  if(auto& sizable = state().sizable) {
+    if(auto self = sizable->self()) self->setFont(sizable->font(true));
   }
 }
 
@@ -125,13 +125,13 @@ auto pWindow::setGeometry(Geometry geometry) -> void {
     geometry.width() + margin.width(), geometry.height() + margin.height(),
     SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED
   );
-  if(auto statusBar = state().statusBar) {
+  if(auto& statusBar = state().statusBar) {
     if(auto self = statusBar->self()) {
       SetWindowPos(self->hwnd, nullptr, 0, 0, 0, 0, SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED);
     }
   }
-  if(auto layout = state().layout) {
-    layout->setGeometry(geometry.setPosition(0, 0));
+  if(auto& sizable = state().sizable) {
+    sizable->setGeometry(geometry.setPosition());
   }
   unlock();
 }
@@ -139,7 +139,7 @@ auto pWindow::setGeometry(Geometry geometry) -> void {
 auto pWindow::setMaximized(bool maximized) -> void {
   if(state().minimized) return;
   lock();
-  ShowWindow(hwnd, maximized ? SW_MAXIMIZED : SW_SHOWNOACTIVATE);
+  ShowWindow(hwnd, maximized ? SW_MAXIMIZE : SW_SHOWNOACTIVATE);
   unlock();
 }
 
@@ -149,7 +149,7 @@ auto pWindow::setMaximumSize(Size size) -> void {
 
 auto pWindow::setMinimized(bool minimized) -> void {
   lock();
-  ShowWindow(hwnd, minimized ? SW_MINIMIZED : state().maximized ? SW_MAXIMIZED : SW_SHOWNOACTIVATE);
+  ShowWindow(hwnd, minimized ? SW_MINIMIZE : state().maximized ? SW_MAXIMIZE : SW_SHOWNOACTIVATE);
   unlock();
 }
 
@@ -187,8 +187,8 @@ auto pWindow::setVisible(bool visible) -> void {
   ShowWindow(hwnd, visible ? SW_SHOWNORMAL : SW_HIDE);
   if(!visible) setModal(false);
 
-  if(auto layout = state().layout) {
-    if(auto self = layout->self()) self->setVisible(layout->visible(true));
+  if(auto& sizable = state().sizable) {
+    if(auto self = sizable->self()) self->setVisible(sizable->visible(true));
   }
   unlock();
 }
@@ -239,8 +239,8 @@ auto pWindow::onSize() -> void {
     }
   }
   state().geometry.setSize(_geometry().size());
-  if(auto layout = state().layout) {
-    layout->setGeometry(_geometry().setPosition(0, 0));
+  if(auto& sizable = state().sizable) {
+    sizable->setGeometry(_geometry().setPosition());
   }
   self().doSize();
 }
diff --git a/hiro/windows/window.hpp b/hiro/windows/window.hpp
index 55da425c..33219888 100644
--- a/hiro/windows/window.hpp
+++ b/hiro/windows/window.hpp
@@ -5,13 +5,13 @@ namespace hiro {
 struct pWindow : pObject {
   Declare(Window, Object)
 
-  auto append(sLayout layout) -> void;
   auto append(sMenuBar menuBar) -> void;
+  auto append(sSizable sizable) -> void;
   auto append(sStatusBar statusBar) -> void;
   auto focused() const -> bool override;
   auto frameMargin() const -> Geometry;
-  auto remove(sLayout layout) -> void;
   auto remove(sMenuBar menuBar) -> void;
+  auto remove(sSizable sizable) -> void;
   auto remove(sStatusBar statusBar) -> void;
   auto setBackgroundColor(Color color) -> void;
   auto setDismissable(bool dismissable) -> void;
diff --git a/icarus/GNUmakefile b/icarus/GNUmakefile
index 45d73e4d..593d9801 100644
--- a/icarus/GNUmakefile
+++ b/icarus/GNUmakefile
@@ -1,17 +1,22 @@
-build := performance
-include ../nall/GNUmakefile
-include ../hiro/GNUmakefile
-
 name := icarus
+build := performance
+
+nall.path := ../nall
+include $(nall.path)/GNUmakefile
+
+object.path := obj
 flags += -I..
 
-objects := obj/hiro.o
-objects += obj/icarus.o
-objects += $(if $(call streq,$(platform),windows),obj/resource.o)
+hiro.path := ../hiro
+hiro.resource := data/$(name).rc
+include $(hiro.path)/GNUmakefile
 
-default: information $(objects)
+objects += obj/hiro.o $(if $(call streq,$(platform),windows),obj/hiro-resource.o)
+objects += obj/icarus.o
+
+all: $(objects)
 	$(info Linking out/$(name) ...)
-	+@$(strip $(compiler) -o out/$(name) $(objects) $(link) $(hirolink))
+	+@$(strip $(compiler) -o out/$(name) $(objects) $(options) $(hiro.options))
 ifeq ($(platform),macos)
 	rm -rf out/$(name).app
 	mkdir -p out/$(name).app/Contents/MacOS/
@@ -21,17 +26,9 @@ ifeq ($(platform),macos)
 	sips -s format icns data/$(name).png --out out/$(name).app/Contents/Resources/$(name).icns
 endif
 
-obj/hiro.o: ../hiro/hiro.cpp
-	$(info Compiling $< ...)
-	@$(compiler) $(hiroflags) -o obj/hiro.o -c ../hiro/hiro.cpp
-
 obj/icarus.o: icarus.cpp $(call rwildcard,core/) $(call rwildcard,heuristics/) $(call rwildcard,ui/)
 	$(info Compiling $< ...)
-	@$(compiler) $(cppflags) $(flags) -o obj/icarus.o -c icarus.cpp
-
-obj/resource.o: data/$(name).rc
-	$(info Compiling $< ...)
-	@$(windres) data/$(name).rc obj/resource.o
+	@$(compiler) $(flags.cpp) $(flags) -o obj/icarus.o -c icarus.cpp
 
 clean:
 ifeq ($(platform),macos)
diff --git a/icarus/ui/error-dialog.cpp b/icarus/ui/error-dialog.cpp
index 9de2d17d..847efb08 100644
--- a/icarus/ui/error-dialog.cpp
+++ b/icarus/ui/error-dialog.cpp
@@ -2,7 +2,7 @@ ErrorDialog::ErrorDialog() {
   errorDialog = this;
 
   onClose([&] { setVisible(false); scanDialog->show(); });
-  layout.setMargin(5);
+  layout.setPadding(5);
   errorLog.setEditable(false);
   closeButton.setText("Close").onActivate([&] { doClose(); });
 
diff --git a/icarus/ui/import-dialog.cpp b/icarus/ui/import-dialog.cpp
index 4a88f01d..6fd8f553 100644
--- a/icarus/ui/import-dialog.cpp
+++ b/icarus/ui/import-dialog.cpp
@@ -5,7 +5,7 @@ ImportDialog::ImportDialog() {
     stopButton.setEnabled(false).setText("Stopping ...");
     abort = true;
   });
-  layout.setMargin(5);
+  layout.setPadding(5);
   stopButton.setText("Stop").onActivate([&] { doClose(); });
 
   setTitle("icarus - Importing ...");
diff --git a/icarus/ui/scan-dialog.cpp b/icarus/ui/scan-dialog.cpp
index b84bf78c..158acc4c 100644
--- a/icarus/ui/scan-dialog.cpp
+++ b/icarus/ui/scan-dialog.cpp
@@ -2,7 +2,7 @@ ScanDialog::ScanDialog() {
   scanDialog = this;
 
   onClose(&Application::quit);
-  layout.setMargin(5);
+  layout.setPadding(5);
   pathEdit.onActivate([&] { refresh(); });
   refreshButton.setIcon(Icon::Action::Refresh).setBordered(false).onActivate([&] {
     pathEdit.setText(settings["icarus/Path"].text());
diff --git a/icarus/ui/settings-dialog.cpp b/icarus/ui/settings-dialog.cpp
index a5a5191c..5dfabaef 100644
--- a/icarus/ui/settings-dialog.cpp
+++ b/icarus/ui/settings-dialog.cpp
@@ -1,7 +1,7 @@
 SettingsDialog::SettingsDialog() {
   settingsDialog = this;
 
-  layout.setMargin(5);
+  layout.setPadding(5);
   locationLabel.setText("Library Location:");
   locationEdit.setEditable(false).setText(settings["Library/Location"].text());
   changeLocationButton.setText("Change ...").onActivate([&] {
diff --git a/nall/GNUmakefile b/nall/GNUmakefile
index 8a2935eb..efbaf000 100644
--- a/nall/GNUmakefile
+++ b/nall/GNUmakefile
@@ -39,18 +39,19 @@ ifeq ($(platform),)
   endif
 endif
 
-cflags := -x c -std=c11
-objcflags := -x objective-c -std=c11
-cppflags := -x c++ -std=c++14
-objcppflags := -x objective-c++ -std=c++14
-flags :=
-link :=
+flags.c      := -x c -std=c11
+flags.cpp    := -x c++ -std=c++14
+flags.objc   := -x objective-c -std=c11
+flags.objcpp := -x objective-c++ -std=c++14
+
+flags   :=
+options :=
 
 # compiler detection
 ifeq ($(compiler),)
   ifeq ($(platform),windows)
     compiler := g++
-    cppflags := -x c++ -std=gnu++14
+    flags.cpp := -x c++ -std=gnu++14
   else ifeq ($(platform),macos)
     compiler := clang++
   else ifeq ($(platform),linux)
@@ -77,16 +78,16 @@ endif
 
 # link-time optimization
 ifeq ($(lto),true)
-  flags += -fwhole-program -flto -fno-fat-lto-objects
-  link += -fwhole-program -flto=jobserver
+  flags   += -fwhole-program -flto -fno-fat-lto-objects
+  options += -fwhole-program -flto=jobserver
 endif
 
 # openmp support
 ifeq ($(openmp),true)
   # macOS Xcode does not ship with OpenMP support
   ifneq ($(platform),macos)
-    flags += -fopenmp
-    link += -fopenmp
+    flags   += -fopenmp
+    options += -fopenmp
   endif
 endif
 
@@ -100,35 +101,35 @@ endif
 
 # windows settings
 ifeq ($(platform),windows)
-  link += -mthreads -lpthread -lws2_32 -lole32
-  link += $(if $(findstring g++,$(compiler)),-static -static-libgcc -static-libstdc++)
-  link += $(if $(findstring true,$(console)),-mconsole,-mwindows)
+  options += -mthreads -lpthread -lws2_32 -lole32
+  options += $(if $(findstring g++,$(compiler)),-static -static-libgcc -static-libstdc++)
+  options += $(if $(findstring true,$(console)),-mconsole,-mwindows)
   windres := windres
 endif
 
 # macos settings
 ifeq ($(platform),macos)
-  flags += -stdlib=libc++
-  link += -lc++ -lobjc
+  flags   += -stdlib=libc++
+  options += -lc++ -lobjc
 endif
 
 # linux settings
 ifeq ($(platform),linux)
-  link += -ldl
+  options += -ldl
 endif
 
 # bsd settings
 ifeq ($(platform),bsd)
-  flags += -I/usr/local/include
-  link += -Wl,-rpath=/usr/local/lib
-  link += -Wl,-rpath=/usr/local/lib/gcc49
+  flags   += -I/usr/local/include
+  options += -Wl,-rpath=/usr/local/lib
+  options += -Wl,-rpath=/usr/local/lib/gcc49
 endif
 
 # threading support
 ifeq ($(threaded),true)
   ifneq ($(filter $(platform),linux bsd),)
-    flags += -pthread
-    link += -pthread -lrt
+    flags   += -pthread
+    options += -pthread -lrt
   endif
 endif
 
@@ -136,13 +137,13 @@ endif
 prefix := $(HOME)/.local
 
 # targets
-all: default;
-
+default: all;
+verbose: information all;
 information:
 	$(info Compiler Flags:)
 	$(foreach n,$(sort $(call unique,$(flags))),$(if $(filter-out -I%,$n),$(info $([space]) $n)))
-	$(info Linker Flags:)
-	$(foreach n,$(sort $(call unique,$(link))),$(if $(filter-out -l%,$n),$(info $([space]) $n)))
+	$(info Linker Options:)
+	$(foreach n,$(sort $(call unique,$(options))),$(if $(filter-out -l%,$n),$(info $([space]) $n)))
 
 # function rwildcard(directory, pattern)
 rwildcard = \
diff --git a/nall/arithmetic/natural.hpp b/nall/arithmetic/natural.hpp
index be77fc19..63e317d6 100644
--- a/nall/arithmetic/natural.hpp
+++ b/nall/arithmetic/natural.hpp
@@ -76,9 +76,9 @@ struct Pair {
   template<typename T> auto operator< (const T& rhs) const -> bool { return Cast(*this) <  Cast(rhs); }
 
   explicit Pair(const vector<uint8_t>& value) : hi(0), lo(0) {
-    for(auto n : rrange(value)) {
+    for(auto n : reverse(value)) {
       operator<<=(8);
-      operator|=(value[n]);
+      operator|=(n);
     }
   }
 
diff --git a/nall/elliptic-curve/curve25519.hpp b/nall/elliptic-curve/curve25519.hpp
index 2f63e63f..0ef6efa8 100644
--- a/nall/elliptic-curve/curve25519.hpp
+++ b/nall/elliptic-curve/curve25519.hpp
@@ -39,7 +39,7 @@ private:
 
   inline auto scalarMultiply(uint256_t e, field b) const -> point {
     point p{1, 0}, q{b, 1};
-    for(uint n : rrange(255)) {
+    for(uint n : reverse(range(255))) {
       bool bit = e >> n & 1;
       cswap(bit, p.x, q.x);
       cswap(bit, p.z, q.z);
diff --git a/nall/elliptic-curve/ed25519.hpp b/nall/elliptic-curve/ed25519.hpp
index ce1c4734..6e21910e 100644
--- a/nall/elliptic-curve/ed25519.hpp
+++ b/nall/elliptic-curve/ed25519.hpp
@@ -135,7 +135,7 @@ private:
 
   inline auto scalarMultiply(uint512_t e, point q) const -> point {
     point p{0, 1, 1, 0}, c;
-    for(uint n : rrange(253)) {
+    for(uint n : reverse(range(253))) {
       p = edwardsDouble(p);
       c = edwardsAdd(p, q);
       bool bit = e >> n & 1;
@@ -149,7 +149,7 @@ private:
 
   inline auto scalarMultiplyB(uint512_t e) const -> point {
     point p{0, 1, 1, 0}, c;
-    for(uint n : rrange(253)) {
+    for(uint n : reverse(range(253))) {
       bool bit = e >> n & 1;
       c = edwardsAdd(p, Bscalar[n]);
       cmove(bit, p.x, c.x);
diff --git a/nall/elliptic-curve/modulo25519.hpp b/nall/elliptic-curve/modulo25519.hpp
index 965bb10b..b5aa7cd7 100644
--- a/nall/elliptic-curve/modulo25519.hpp
+++ b/nall/elliptic-curve/modulo25519.hpp
@@ -186,7 +186,7 @@ struct Modulo25519 {
 
   inline auto expmod(uint256_t e) const -> type {
     type x = 1, y;
-    for(uint n : rrange(256)) {
+    for(uint n : reverse(range(256))) {
       x = x.square();
       y = operator*(x);
       cmove(e >> n & 1, x, y);
diff --git a/nall/hash/crc16.hpp b/nall/hash/crc16.hpp
index 6feb8ccc..5829196f 100644
--- a/nall/hash/crc16.hpp
+++ b/nall/hash/crc16.hpp
@@ -17,7 +17,7 @@ struct CRC16 : Hash {
 
   auto output() const -> vector<uint8_t> override {
     vector<uint8_t> result;
-    for(auto n : rrange(2)) result.append(~checksum >> n * 8);
+    for(auto n : reverse(range(2))) result.append(~checksum >> n * 8);
     return result;
   }
 
diff --git a/nall/hash/crc32.hpp b/nall/hash/crc32.hpp
index e0614bab..20bb7eed 100644
--- a/nall/hash/crc32.hpp
+++ b/nall/hash/crc32.hpp
@@ -17,7 +17,7 @@ struct CRC32 : Hash {
 
   auto output() const -> vector<uint8_t> {
     vector<uint8_t> result;
-    for(auto n : rrange(4)) result.append(~checksum >> n * 8);
+    for(auto n : reverse(range(4))) result.append(~checksum >> n * 8);
     return result;
   }
 
diff --git a/nall/hash/crc64.hpp b/nall/hash/crc64.hpp
index b693a0e4..23c74a65 100644
--- a/nall/hash/crc64.hpp
+++ b/nall/hash/crc64.hpp
@@ -17,7 +17,7 @@ struct CRC64 : Hash {
 
   auto output() const -> vector<uint8_t> {
     vector<uint8_t> result;
-    for(auto n : rrange(8)) result.append(~checksum >> n * 8);
+    for(auto n : reverse(range(8))) result.append(~checksum >> n * 8);
     return result;
   }
 
diff --git a/nall/hash/sha224.hpp b/nall/hash/sha224.hpp
index cd2c6cab..9f1b74e2 100644
--- a/nall/hash/sha224.hpp
+++ b/nall/hash/sha224.hpp
@@ -24,7 +24,7 @@ struct SHA224 : Hash {
     self.finish();
     vector<uint8_t> result;
     for(auto h : range(7)) {
-      for(auto n : rrange(4)) result.append(self.h[h] >> n * 8);
+      for(auto n : reverse(range(4))) result.append(self.h[h] >> n * 8);
     }
     return result;
   }
diff --git a/nall/hash/sha256.hpp b/nall/hash/sha256.hpp
index 4274a11e..04e81fff 100644
--- a/nall/hash/sha256.hpp
+++ b/nall/hash/sha256.hpp
@@ -24,7 +24,7 @@ struct SHA256 : Hash {
     self.finish();
     vector<uint8_t> result;
     for(auto h : self.h) {
-      for(auto n : rrange(4)) result.append(h >> n * 8);
+      for(auto n : reverse(range(4))) result.append(h >> n * 8);
     }
     return result;
   }
diff --git a/nall/hash/sha384.hpp b/nall/hash/sha384.hpp
index 78c3f8d4..e0be5d9f 100644
--- a/nall/hash/sha384.hpp
+++ b/nall/hash/sha384.hpp
@@ -24,7 +24,7 @@ struct SHA384 : Hash {
     self.finish();
     vector<uint8_t> result;
     for(auto h : range(6)) {
-      for(auto n : rrange(8)) result.append(self.h[h] >> n * 8);
+      for(auto n : reverse(range(8))) result.append(self.h[h] >> n * 8);
     }
     return result;
   }
diff --git a/nall/hash/sha512.hpp b/nall/hash/sha512.hpp
index a2ed8143..0827982e 100644
--- a/nall/hash/sha512.hpp
+++ b/nall/hash/sha512.hpp
@@ -24,7 +24,7 @@ struct SHA512 : Hash {
     self.finish();
     vector<uint8_t> result;
     for(auto h : self.h) {
-      for(auto n : rrange(8)) result.append(h >> n * 8);
+      for(auto n : reverse(range(8))) result.append(h >> n * 8);
     }
     return result;
   }
diff --git a/nall/http/message.hpp b/nall/http/message.hpp
index a7828540..59a9e2ea 100644
--- a/nall/http/message.hpp
+++ b/nall/http/message.hpp
@@ -66,7 +66,7 @@ struct Variables {
   }
 
   auto remove(const string& name) -> void {
-    for(auto n : rrange(variables)) {
+    for(auto n : reverse(range(variables.size()))) {
       if(variables[n].shared->name.iequals(name)) variables.remove(n);
     }
   }
diff --git a/nall/iterator.hpp b/nall/iterator.hpp
new file mode 100644
index 00000000..e6f2e0b0
--- /dev/null
+++ b/nall/iterator.hpp
@@ -0,0 +1,75 @@
+#pragma once
+
+namespace nall {
+
+template<typename T> struct iterator {
+  iterator(T* self, uint offset) : self(self), offset(offset) {}
+  auto operator*() -> T& { return self[offset]; }
+  auto operator!=(const iterator& source) const -> bool { return offset != source.offset; }
+  auto operator++() -> iterator& { return offset++, *this; }
+
+private:
+  T* self;
+  uint offset;
+};
+
+template<typename T> struct iterator_const {
+  iterator_const(const T* self, uint offset) : self(self), offset(offset) {}
+  auto operator*() -> const T& { return self[offset]; }
+  auto operator!=(const iterator_const& source) const -> bool { return offset != source.offset; }
+  auto operator++() -> iterator_const& { return offset++, *this; }
+
+private:
+  const T* self;
+  uint offset;
+};
+
+template<typename T> struct reverse_iterator {
+  reverse_iterator(T* self, uint offset) : self(self), offset(offset) {}
+  auto operator*() -> T& { return self[offset]; }
+  auto operator!=(const reverse_iterator& source) const -> bool { return offset != source.offset; }
+  auto operator++() -> reverse_iterator& { return offset--, *this; }
+
+private:
+  T* self;
+  uint offset;
+};
+
+template<typename T> struct reverse_iterator_const {
+  reverse_iterator_const(const T* self, uint offset) : self(self), offset(offset) {}
+  auto operator*() -> const T& { return self[offset]; }
+  auto operator!=(const reverse_iterator_const& source) const -> bool { return offset != source.offset; }
+  auto operator++() -> reverse_iterator_const& { return offset--, *this; }
+
+private:
+  const T* self;
+  uint offset;
+};
+
+//std::rbegin(), std::rend() is missing from GCC 4.9; which I still target
+
+template<typename T, uint Size> auto rbegin(T (&array)[Size]) { return reverse_iterator<T>{array, Size - 1}; }
+template<typename T, uint Size> auto rend(T (&array)[Size]) { return reverse_iterator<T>{array, (uint)-1}; }
+
+template<typename T> auto rbegin(T& self) { return self.rbegin(); }
+template<typename T> auto rend(T& self) { return self.rend(); }
+
+template<typename T> struct reverse_wrapper {
+  T self;
+
+  auto begin() { return rbegin(self); }
+  auto end() { return rend(self); }
+
+  auto begin() const { return rbegin(self); }
+  auto end() const { return rend(self); }
+};
+
+template<typename T> auto reverse(T& object) -> reverse_wrapper<T&> {
+  return {object};
+}
+
+template<typename T> auto reverse(T&& object) -> reverse_wrapper<T> {
+  return {object};
+}
+
+}
diff --git a/nall/locale.hpp b/nall/locale.hpp
new file mode 100644
index 00000000..3bdc35c5
--- /dev/null
+++ b/nall/locale.hpp
@@ -0,0 +1,81 @@
+#pragma once
+
+namespace nall {
+
+struct Locale {
+  struct Dictionary {
+    string location;
+    string language;
+    Markup::Node document;
+  };
+
+  auto scan(string pathname) -> void {
+    dictionaries.reset();
+    selected.reset();
+    for(auto filename : directory::icontents(pathname, "*.bml")) {
+      Dictionary dictionary;
+      dictionary.location = {pathname, filename};
+      dictionary.document = BML::unserialize(string::read(dictionary.location));
+      dictionary.language = dictionary.document["locale/language"].text();
+      dictionaries.append(dictionary);
+    }
+  }
+
+  auto available() const -> string_vector {
+    string_vector result;
+    for(auto& dictionary : dictionaries) {
+      result.append(dictionary.language);
+    }
+    return result;
+  }
+
+  auto select(string language) -> bool {
+    selected.reset();
+    for(auto& dictionary : dictionaries) {
+      if(dictionary.language == language) {
+        selected = dictionary;
+        break;
+      }
+    }
+  }
+
+  template<typename... P>
+  auto operator()(string ns, string input, P&&... p) const -> string {
+    string_vector arguments{forward<P>(p)...};
+    if(selected) {
+      for(auto node : selected().document) {
+        if(node.name() == "namespace" && node.text() == ns) {
+          for(auto map : node) {
+            if(map.name() == "map" && map["input"].text() == input) {
+              input = map["value"].text();
+              break;
+            }
+          }
+        }
+      }
+    }
+    for(uint index : range(arguments.size())) {
+      input.replace({"{", index, "}"}, arguments[index]);
+    }
+    return input;
+  }
+
+  struct Namespace {
+    Namespace(Locale& _locale, string _namespace) : _locale(_locale), _namespace(_namespace) {}
+
+    template<typename... P>
+    auto tr(string input, P&&... p) const -> string {
+      return _locale(_namespace, input, forward<P>(p)...);
+    }
+
+  private:
+    Locale& _locale;
+    string _namespace;
+  };
+
+private:
+  vector<Dictionary> dictionaries;
+  maybe<Dictionary&> selected;
+};
+
+}
diff --git a/nall/nall.hpp b/nall/nall.hpp
index fd7fac00..8592407d 100644
--- a/nall/nall.hpp
+++ b/nall/nall.hpp
@@ -34,6 +34,8 @@
 #include <nall/inode.hpp>
 #include <nall/interpolation.hpp>
 #include <nall/intrinsics.hpp>
+#include <nall/iterator.hpp>
+#include <nall/locale.hpp>
 #include <nall/location.hpp>
 #include <nall/map.hpp>
 #include <nall/matrix.hpp>
diff --git a/nall/range.hpp b/nall/range.hpp
index a64fd3e5..e2e5e595 100644
--- a/nall/range.hpp
+++ b/nall/range.hpp
@@ -14,8 +14,22 @@ struct range_t {
     const int step;
   };
 
-  auto begin() const -> const iterator { return iterator(origin, stride); }
-  auto end() const -> const iterator { return iterator(target); }
+  struct reverse_iterator {
+    reverse_iterator(int position, int step = 0) : position(position), step(step) {}
+    auto operator*() const -> int { return position; }
+    auto operator!=(const reverse_iterator& source) const -> bool { return step > 0 ? position > source.position : position < source.position; }
+    auto operator++() -> reverse_iterator& { position -= step; return *this; }
+
+  private:
+    int position;
+    const int step;
+  };
+
+  auto begin() const -> iterator { return {origin, stride}; }
+  auto end() const -> iterator { return {target}; }
+
+  auto rbegin() const -> reverse_iterator { return {target - stride, stride}; }
+  auto rend() const -> reverse_iterator { return {origin - stride}; }
 
   int origin;
   int target;
@@ -34,9 +48,4 @@ inline auto range(int offset, int size, int step) {
   return range_t{offset, size, step};
 }
 
-//reverse-range
-inline auto rrange(int size) {
-  return range_t{size - 1, -1, -1};
-}
-
 }
diff --git a/nall/string.hpp b/nall/string.hpp
index acb3b14d..11641d2c 100644
--- a/nall/string.hpp
+++ b/nall/string.hpp
@@ -331,8 +331,3 @@ struct string_format : vector<string> {
 #include <nall/string/markup/xml.hpp>
 #include <nall/string/transform/cml.hpp>
 #include <nall/string/transform/dml.hpp>
-
-namespace nall {
-//inline auto range(const string& value) { return range_t{0, (int)value.size(), 1}; }
-//inline auto rrange(const string& value) { return range_t{(int)value.size() - 1, -1, -1}; }
-}
diff --git a/nall/string/markup/node.hpp b/nall/string/markup/node.hpp
index fdf95973..c0fa03c4 100644
--- a/nall/string/markup/node.hpp
+++ b/nall/string/markup/node.hpp
@@ -131,8 +131,3 @@ protected:
 };
 
 }}
-
-namespace nall {
-  inline auto range(const Markup::Node& value) { return range_t{0, (int)value.size(), 1}; }
-  inline auto rrange(const Markup::Node& value) { return range_t{(int)value.size() - 1, -1, -1}; }
-}
diff --git a/nall/string/transform/dml.hpp b/nall/string/transform/dml.hpp
index c376b3b1..046b58d0 100644
--- a/nall/string/transform/dml.hpp
+++ b/nall/string/transform/dml.hpp
@@ -75,7 +75,7 @@ auto DML::parseBlock(string& block, const string& pathname, uint depth) -> bool
 
   //html
   else if(block.beginsWith("<html>\n") && settings.allowHTML) {
-    for(auto n : range(lines)) {
+    for(auto n : range(lines.size())) {
       if(n == 0 || !lines[n].beginsWith("  ")) continue;
       state.output.append(lines[n].trimLeft("  ", 1L), "\n");
     }
diff --git a/nall/vector.hpp b/nall/vector.hpp
index 3cd63a13..2ccbfd1f 100644
--- a/nall/vector.hpp
+++ b/nall/vector.hpp
@@ -4,6 +4,7 @@
 
 #include <nall/bit.hpp>
 #include <nall/function.hpp>
+#include <nall/iterator.hpp>
 #include <nall/maybe.hpp>
 #include <nall/memory.hpp>
 #include <nall/range.hpp>
@@ -14,6 +15,8 @@ namespace nall {
 
 template<typename T> struct vector_iterator;
 template<typename T> struct vector_iterator_const;
+template<typename T> struct vector_iterator_reverse;
+template<typename T> struct vector_iterator_reverse_const;
 
 template<typename T>
 struct vector {
@@ -81,11 +84,17 @@ struct vector {
   auto take(uint offset) -> T;
 
   //iterator.hpp
-  auto begin() -> vector_iterator<T> { return vector_iterator<T>{*this, 0}; }
-  auto end() -> vector_iterator<T> { return vector_iterator<T>{*this, size()}; }
+  auto begin() -> iterator<T> { return {data(), 0}; }
+  auto end() -> iterator<T> { return {data(), size()}; }
 
-  auto begin() const -> vector_iterator_const<T> { return vector_iterator_const<T>{*this, 0}; }
-  auto end() const -> vector_iterator_const<T> { return vector_iterator_const<T>{*this, size()}; }
+  auto begin() const -> iterator_const<T> { return {data(), 0}; }
+  auto end() const -> iterator_const<T> { return {data(), size()}; }
+
+  auto rbegin() -> reverse_iterator<T> { return {data(), size() - 1}; }
+  auto rend() -> reverse_iterator<T> { return {data(), (uint)-1}; }
+
+  auto rbegin() const -> reverse_iterator_const<T> { return {data(), size() - 1}; }
+  auto rend() const -> reverse_iterator_const<T> { return {data(), (uint)-1}; }
 
   //utility.hpp
   auto sort(const function<bool (const T& lhs, const T& rhs)>& comparator = [](auto& lhs, auto& rhs) { return lhs < rhs; }) -> void;
@@ -107,8 +116,3 @@ private:
 #include <nall/vector/modify.hpp>
 #include <nall/vector/iterator.hpp>
 #include <nall/vector/utility.hpp>
-
-namespace nall {
-  template<typename T> inline auto range(const vector<T>& value) { return range_t{0, (int)value.size(), 1}; }
-  template<typename T> inline auto rrange(const vector<T>& value) { return range_t{(int)value.size() - 1, -1, -1}; }
-}
diff --git a/nall/vector/iterator.hpp b/nall/vector/iterator.hpp
index ae8c9d91..259d9599 100644
--- a/nall/vector/iterator.hpp
+++ b/nall/vector/iterator.hpp
@@ -26,4 +26,28 @@ private:
   uint offset;
 };
 
+template<typename T>
+struct vector_iterator_reverse {
+  vector_iterator_reverse(vector<T>& self, uint offset) : self(self), offset(offset) {}
+  auto operator*() -> T& { return self.operator[](offset); }
+  auto operator!=(const vector_iterator_reverse& source) const -> bool { return offset != source.offset; }
+  auto operator++() -> vector_iterator_reverse& { return offset--, *this; }
+
+private:
+  vector<T>& self;
+  uint offset;
+};
+
+template<typename T>
+struct vector_iterator_reverse_const {
+  vector_iterator_reverse_const(const vector<T>& self, uint offset) : self(self), offset(offset) {}
+  auto operator*() -> const T& { return self.operator[](offset); }
+  auto operator!=(const vector_iterator_reverse_const& source) const -> bool { return offset != source.offset; }
+  auto operator++() -> vector_iterator_reverse_const& { return offset--, *this; }
+
+private:
+  const vector<T>& self;
+  uint offset;
+};
+
 }
diff --git a/nall/vector/memory.hpp b/nall/vector/memory.hpp
index 4b54bb78..a73532b3 100644
--- a/nall/vector/memory.hpp
+++ b/nall/vector/memory.hpp
@@ -62,7 +62,7 @@ template<typename T> auto vector<T>::resizeLeft(uint size, const T& value) -> bo
   if(size > _size) {  //grow
     reserveLeft(size);
     _pool -= size - _size;
-    for(uint n : rrange(size - _size)) new(_pool + n) T(value);
+    for(uint n : reverse(range(size - _size))) new(_pool + n) T(value);
     _left -= size - _size;
     _size = size;
     return true;
diff --git a/nall/vector/modify.hpp b/nall/vector/modify.hpp
index 402429b4..8e11f8dd 100644
--- a/nall/vector/modify.hpp
+++ b/nall/vector/modify.hpp
@@ -50,14 +50,14 @@ template<typename T> auto vector<T>::append(T&& value) -> void {
 
 template<typename T> auto vector<T>::append(const vector<T>& values) -> void {
   reserveRight(size() + values.size());
-  for(uint n : range(values)) new(_pool + _size + n) T(values[n]);
+  for(uint n : range(values.size())) new(_pool + _size + n) T(values[n]);
   _right -= values.size();
   _size += values.size();
 }
 
 template<typename T> auto vector<T>::append(vector<T>&& values) -> void {
   reserveRight(size() + values.size());
-  for(uint n : range(values)) new(_pool + _size + n) T(move(values[n]));
+  for(uint n : range(values.size())) new(_pool + _size + n) T(move(values[n]));
   _right -= values.size();
   _size += values.size();
 }
diff --git a/nall/vfs/vfs.hpp b/nall/vfs/vfs.hpp
index b1589bbf..e8e05e1d 100644
--- a/nall/vfs/vfs.hpp
+++ b/nall/vfs/vfs.hpp
@@ -57,7 +57,7 @@ struct file {
   }
 
   auto writem(uintmax data, uint bytes) -> void {
-    for(auto n : rrange(bytes)) write(data >> n * 8);
+    for(auto n : reverse(range(bytes))) write(data >> n * 8);
   }
 
   auto writes(const string& s) -> void {
diff --git a/ruby/GNUmakefile b/ruby/GNUmakefile
index 5e143a97..7b8e96f3 100644
--- a/ruby/GNUmakefile
+++ b/ruby/GNUmakefile
@@ -1,47 +1,51 @@
 ifeq ($(platform),macos)
-  rubyflags = $(objcppflags) $(flags)
+  ruby.flags := $(flags.objcpp)
 else
-  rubyflags = $(cppflags) $(flags)
+  ruby.flags := $(flags.cpp)
 endif
 
-rubyflags += $(foreach c,$(subst .,_,$(call strupper,$(ruby))),-D$c)
-rubyflags += $(if $(findstring input.sdl,$(ruby)),$(shell sdl2-config --cflags))
+ruby.flags += $(foreach c,$(subst .,_,$(call strupper,$(ruby))),-D$c)
+ruby.flags += $(if $(findstring input.sdl,$(ruby)),$(shell sdl2-config --cflags))
 
-rubylink =
+ruby.options :=
 
-rubylink += $(if $(findstring video.cgl,$(ruby)),-framework OpenGL)
-rubylink += $(if $(findstring video.direct3d,$(ruby)),-ld3d9)
-rubylink += $(if $(findstring video.directdraw,$(ruby)),-lddraw)
-rubylink += $(if $(findstring video.glx,$(ruby)),-lGL)
-rubylink += $(if $(findstring video.wgl,$(ruby)),-lopengl32)
-rubylink += $(if $(findstring video.xvideo,$(ruby)),-lXv)
+ruby.options += $(if $(findstring video.cgl,$(ruby)),-framework OpenGL)
+ruby.options += $(if $(findstring video.direct3d,$(ruby)),-ld3d9)
+ruby.options += $(if $(findstring video.directdraw,$(ruby)),-lddraw)
+ruby.options += $(if $(findstring video.glx,$(ruby)),-lGL)
+ruby.options += $(if $(findstring video.wgl,$(ruby)),-lopengl32)
+ruby.options += $(if $(findstring video.xvideo,$(ruby)),-lXv)
 
-rubylink += $(if $(findstring audio.alsa,$(ruby)),-lasound)
-rubylink += $(if $(findstring audio.ao,$(ruby)),-lao)
-rubylink += $(if $(findstring audio.directsound,$(ruby)),-ldsound)
-rubylink += $(if $(findstring audio.pulseaudio,$(ruby)),-lpulse)
-rubylink += $(if $(findstring audio.pulseaudiosimple,$(ruby)),-lpulse-simple)
-rubylink += $(if $(findstring audio.wasapi,$(ruby)),-lavrt -luuid)
-rubylink += $(if $(findstring audio.xaudio2,$(ruby)),-lole32)
+ruby.options += $(if $(findstring audio.alsa,$(ruby)),-lasound)
+ruby.options += $(if $(findstring audio.ao,$(ruby)),-lao)
+ruby.options += $(if $(findstring audio.directsound,$(ruby)),-ldsound)
+ruby.options += $(if $(findstring audio.pulseaudio,$(ruby)),-lpulse)
+ruby.options += $(if $(findstring audio.pulseaudiosimple,$(ruby)),-lpulse-simple)
+ruby.options += $(if $(findstring audio.wasapi,$(ruby)),-lavrt -luuid)
+ruby.options += $(if $(findstring audio.xaudio2,$(ruby)),-lole32)
 
-rubylink += $(if $(findstring input.sdl,$(ruby)),$(shell sdl2-config --libs))
-rubylink += $(if $(findstring input.udev,$(ruby)),-ludev)
-rubylink += $(if $(findstring input.windows,$(ruby)),-ldinput8 -ldxguid)
+ruby.options += $(if $(findstring input.sdl,$(ruby)),$(shell sdl2-config --libs))
+ruby.options += $(if $(findstring input.udev,$(ruby)),-ludev)
+ruby.options += $(if $(findstring input.windows,$(ruby)),-ldinput8 -ldxguid)
 
 ifeq ($(platform),windows)
-  rubylink += $(if $(findstring audio.openal,$(ruby)),-lopenal32)
+  ruby.options += $(if $(findstring audio.openal,$(ruby)),-lopenal32)
 endif
 
 ifeq ($(platform),macos)
-  rubylink += $(if $(findstring audio.openal,$(ruby)),-framework OpenAL)
+  ruby.options += $(if $(findstring audio.openal,$(ruby)),-framework OpenAL)
 endif
 
 ifeq ($(platform),linux)
-  rubylink += -lX11 -lXext
-  rubylink += $(if $(findstring audio.openal,$(ruby)),-lopenal)
+  ruby.options += -lX11 -lXext
+  ruby.options += $(if $(findstring audio.openal,$(ruby)),-lopenal)
 endif
 
 ifeq ($(platform),bsd)
-  rubylink += -lX11 -lXext
-  rubylink += $(if $(findstring audio.openal,$(ruby)),-lopenal)
+  ruby.options += -lX11 -lXext
+  ruby.options += $(if $(findstring audio.openal,$(ruby)),-lopenal)
 endif
+
+$(object.path)/ruby.o: $(ruby.path)/ruby.cpp $(call rwildcard,$(ruby.path)) $(call rwildcard,$(nall.path))
+	$(info Compiling $< ...)
+	@$(compiler) $(ruby.flags) $(flags) -c $< -o $@
diff --git a/ruby/input/joypad/sdl.cpp b/ruby/input/joypad/sdl.cpp
index e8b0c9ed..16667056 100644
--- a/ruby/input/joypad/sdl.cpp
+++ b/ruby/input/joypad/sdl.cpp
@@ -23,7 +23,7 @@ struct InputJoypadSDL {
     SDL_JoystickUpdate();
 
     for(auto& jp : joypads) {
-      for(auto n : range(jp.hid->axes())) {
+      for(auto n : range(jp.hid->axes().size())) {
         assign(jp.hid, HID::Joypad::GroupID::Axis, n, (int16_t)SDL_JoystickGetAxis(jp.handle, n));
       }
 
@@ -33,7 +33,7 @@ struct InputJoypadSDL {
         assign(jp.hid, HID::Joypad::GroupID::Hat, n + 1, state & SDL_HAT_UP   ? -32767 : state & SDL_HAT_DOWN  ? +32767 : 0);
       }
 
-      for(auto n : range(jp.hid->buttons())) {
+      for(auto n : range(jp.hid->buttons().size())) {
         assign(jp.hid, HID::Joypad::GroupID::Button, n, (bool)SDL_JoystickGetButton(jp.handle, n));
       }
 
diff --git a/ruby/input/keyboard/rawinput.cpp b/ruby/input/keyboard/rawinput.cpp
index 0f2b2a03..3c3bfeba 100644
--- a/ruby/input/keyboard/rawinput.cpp
+++ b/ruby/input/keyboard/rawinput.cpp
@@ -34,7 +34,7 @@ struct InputKeyboardRawInput {
   }
 
   auto poll(vector<shared_pointer<HID::Device>>& devices) -> void {
-    for(auto n : range(keys)) assign(n, keys[n].value);
+    for(auto n : range(keys.size())) assign(n, keys[n].value);
     devices.append(kb.hid);
   }