Added some changes. Yet to do icon part.