Chloe | Menu Modal finished
 Chloe | Fixed merge conflict