Cleaned up UI bindings