Added some new features in GUI