Changes Done frontend
Merge pull request #74 from Dragonn11/master

Changes Done frontend