UPDATED: Few minor about gui fixes