Merge pull request #9 from yssamarie/master

modified ui