Update to use contraint based layout