Integrated Brooke's GUI changes and Oliver's Elements