Added tradepoint to top menu and fixed some identation
Merge commit 'f5fb279f29cf4b2b96aafd6da92dd7965122111c' into HEAD