removed some redundant code
basic layout for trading in place