Fixed reset button + set minimal loading time
Patched up screen display problems
Merge remote-tracking branch 'origin/SagieBranch'