Fix snowstorm issue
Improve UI/UX