Time improvements and better settings screen