modal fix and some menu changes