Improvements

Code Improvements
Added Apply Button