Improve data preparation
Improve restart
Fix layout for small screen