Code Cleaning + some UI changes