Fix for timeout function / change layout / add new menu item
Add chapter exams list
Some changes....
Merge remote-tracking branch 'origin/master'