Fix and Update

- Fixed close bug on inactivity popup
- Better preselectionin inactivity popup
- Working on the timetable