Code Refactored.. and UI changes