flat ui redesign, added edit button functionality
Merge pull request #4 from nicolezhu/master

flat ui redesign, added edit button functionality