aligned label and edit button on dialog popup
custom edit button added
Merge pull request #52 from megsandman/andrea_coffee_and_style_changes

Andrea coffee and style changes