added feature to complete trades, tidied up tables