Partially address #557 and improve how added widgets are positioned