Update Ui and Some Code

Do not go gentle into that good night