Before menu change

Also fixed modal closing and a lot of other studd