Updated for three column

Having some problems, haven't bug tested yet.