added more trajectory components, but more importantly refactored UI code to be less hard coded