merging
sheynas merge
add teal close button
this thing is working