Clean Up & icons & possibly add weather