basic UI changes to modal
merged changes