Additional Styling, clean up, and Edit Action added