Added some improvements for a more user friendly UI