Modified UI and Refactored Edit Button Pressed