Clean Up
Fixes for better user Experience