Sorted out default data
Changed timeouts
Other minor gui improvements