Some more additions and improvements in GUI