#17 Design fixes + added default order column