Minor styling changes; mostly a mess