Switched form builder to use percentage-based units