added "order by" toolbar // styling // cleanup