Improved many things particularly in GUI